| commit | 3043e44bcce43532d4536fbe5a4a8e457815ab17 | [log] [tgz] |
|---|---|---|
| author | Torne (Richard Coles) <torne@google.com> | Thu Oct 29 16:47:20 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 29 16:47:20 2015 +0000 |
| tree | 71699c7e54d90a119df4039851804ffc096bf570 | |
| parent | c574cf5c091a964c1f9eca8ed9786e7ecc87ae03 [diff] | |
| parent | 4afe4d33efd6c5203f524be0dc1e738ac0aa772b [diff] |
am 30219730: (-s ours) resolved conflicts for merge of 4e0495ed to lmp-mr1-dev-plus-aosp am: 4afe4d33ef * commit '4afe4d33efd6c5203f524be0dc1e738ac0aa772b':