| commit | 8b262b9de4defd234ec3593453bfb1dba4642151 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jul 24 20:02:31 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Jul 24 20:02:31 2015 -0700 |
| tree | 1491a533b5c6592858ddb8ba6432b39d75e8ec56 | |
| parent | a6d23bd6d2c31c1de69a97d78ab1e557bedcc04a [diff] | |
| parent | 038b76c23e8b20b8fc620677d21e90bf430fef84 [diff] |
resolved conflicts for merge of 038b76c2 to mnc-dev-plus-aosp Change-Id: Id84946b67f207a7586cfa9c918ee6e4ae335fe86