| commit | 9c4cee956a055068d0fbd5718a9b86228b843f29 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Sat Sep 19 12:24:16 2015 -0700 |
| committer | Colin Cross <ccross@android.com> | Sat Sep 19 12:24:16 2015 -0700 |
| tree | c58ca23271d93eed1f22dd491fb7b0d5cca1e601 | |
| parent | 177259e7392f9a7f977e2eb2d8c1850f7531654e [diff] | |
| parent | edec06f0390d6184c1b537a41083bde60b5eb044 [diff] |
resolved conflicts for edec06f0 to mnc-dr-dev-plus-aosp Change-Id: I93ee3417f8a178bc3ecf885ed1614ff9c41762ef