| commit | 68619c9b53fca44db66cc9989cf218afabcb15bf | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Wed Aug 02 01:23:36 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 01:23:36 2017 +0000 |
| tree | d6711770574f7538af372c2c45532f5b326c62cc | |
| parent | aa956d8f19eeac8440d92df4868c3a13092ac2c9 [diff] | |
| parent | d70c51cdae962943b93dc045708d5b2f015de9b0 [diff] |
resolve merge conflicts of 345a396c to oc-dr1-dev am: a6e57a9647 -s ours am: d70c51cdae -s ours Change-Id: I2a852800a6c31e87d002db710dc10faab7f65d0d