| commit | b270ae04b93652887a061d318570dc6f18667716 | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Wed Aug 02 01:46:33 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 01:46:33 2017 +0000 |
| tree | e379dedd7b86563433bf3fb7be53db4018140f80 | |
| parent | de551386f59b4aa969ced563735c0fedc85e8bfd [diff] | |
| parent | 0014284e4380cf6c326abb585ce2fcbbd05d3e6f [diff] |
resolve merge conflicts of 140b84b3 to oc-dr1-dev-plus-aosp am: 9a73da9161 -s ours am: 0014284e43 -s ours Change-Id: I2baaea0bde82bfba1e8453e3359987daddd450f8