| commit | e43ae37d80144ce792435c6fd5dc1f18976333c2 | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Wed Aug 02 02:15:23 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 02:15:23 2017 +0000 |
| tree | dbd598953bf81fb848ecfab344fdd3bfe1f7aa36 | |
| parent | 6de347e47738f81fbbd2438f3315d75c894b3cf2 [diff] | |
| parent | 9f103257c4308c529d437f445714ff478940f67e [diff] |
resolve merge conflicts of 345a396c to oc-dr1-dev am: a6e57a9647 -s ours am: 9f103257c4 -s ours Change-Id: I543ddfcaab24e3e3d15169647052fd910fabf14c