| commit | d70c51cdae962943b93dc045708d5b2f015de9b0 | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Wed Aug 02 01:19:32 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 01:19:32 2017 +0000 |
| tree | 3dbf12faa06447379744cd144c621deda627477d | |
| parent | 9154eae534a9122f87f45800973218913ac1c2db [diff] | |
| parent | a6e57a9647b98c4ff7dcce3986830218e9d4200a [diff] |
resolve merge conflicts of 345a396c to oc-dr1-dev am: a6e57a9647 -s ours Change-Id: I20dc609d760162f16780115f3af2c8635662f1b5