| commit | 7a9b2867a865e33d5f6bbf258045e3245fcbef91 | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackyu@google.com> | Sun Aug 06 01:13:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Aug 06 01:13:15 2017 +0000 |
| tree | 2255b6f45c9d6e132125db1c026af95f4ed7faf0 | |
| parent | 5078fea438bf1bbb4955da2d57fe56e828a47816 [diff] | |
| parent | 452003beefaeab4b9fc6cd9c47c61032d7247a2b [diff] |
resolve merge conflicts of 5397f5a26 to oc-dr1-dev-plus-aosp am: 452003beef -s ours Change-Id: I55615ec332060de98966a0253072ef493f07970b