| commit | 0014284e4380cf6c326abb585ce2fcbbd05d3e6f | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Wed Aug 02 01:43:03 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 01:43:03 2017 +0000 |
| tree | dbd598953bf81fb848ecfab344fdd3bfe1f7aa36 | |
| parent | 183d5af38d7d0fbaddb0a636c17bd2914f89f147 [diff] | |
| parent | 9a73da916122d7ab1478f9b4e81c20c20445a853 [diff] |
resolve merge conflicts of 140b84b3 to oc-dr1-dev-plus-aosp am: 9a73da9161 -s ours Change-Id: I8583b1e0bf0d01d3eedc3526b5b2870a40f16523