| commit | cc75a2a6d4f0268488f58ce61be77bf7298e1577 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Thu Nov 02 22:50:21 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 02 22:50:21 2017 +0000 |
| tree | d0134385b6fc05fcdf75f816fd86237505cf384d | |
| parent | db3c6b747fd3e2b26c5852af673f5db95007ec2e [diff] | |
| parent | 726af41e68148b3a7561e0e1a37874e3883814e4 [diff] |
resolve merge conflicts of dd5206c57 to oc-mr1-dev-plus-aosp am: 726af41e68 Change-Id: I25b8cd589c96f67b3e10f219e0bf251557a5c4be