| commit | 9f103257c4308c529d437f445714ff478940f67e | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Wed Aug 02 01:58:04 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 01:58:04 2017 +0000 |
| tree | 1717e4f4d5d0779d6885d43abcefc19208441432 | |
| parent | 04eab47d9437578ce77e8f0ba42dea5b9dacfd7e [diff] | |
| parent | a6e57a9647b98c4ff7dcce3986830218e9d4200a [diff] |
resolve merge conflicts of 345a396c to oc-dr1-dev am: a6e57a9647 -s ours Change-Id: Idc6b4412e4f2548d1635136a52f93ff1bdbea4a9