| commit | 1640a5d7ae958b4a45e85d08cee370bd87b4f884 | [log] [tgz] |
|---|---|---|
| author | Myles Watson <mylesgw@google.com> | Fri Mar 09 20:16:12 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 09 20:16:12 2018 +0000 |
| tree | f269b97e2aada79cc86104ab9c9e27b47b5b9b4b | |
| parent | 64af90ebe2872c560fd405629b44c29c244f430e [diff] | |
| parent | af9b85e29a7a2c7d01815c1e3d2e8299b6c5e26f [diff] |
Merge "resolve merge conflicts of b9492b5fe94cb99b5f79964a49313b451b2bc1a4 to oc-mr1-dev" into oc-mr1-dev am: 8ca409dfa1 -s ours am: af9b85e29a -s ours Change-Id: I03f213dee541cd03d4186853450ace73b01e8516