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