| commit | 3aaac55e70de465c95c2950c2a3a892027c54719 | [log] [tgz] |
|---|---|---|
| author | David Christie <dnchrist@google.com> | Wed Aug 24 22:23:46 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 24 22:23:46 2016 +0000 |
| tree | f84ab1ea833126add4f3e78724a9940142d90cc1 | |
| parent | e24eb2dbb5e54b410d30bfcd8efb21029cc0b2d4 [diff] | |
| parent | dd1016c619cc810bf59f6bd9c4f4aa90418b8264 [diff] |
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 Change-Id: I54910f6c22b69b029be80007cdbf06b203886398