| commit | 13cd4701e9c9ce9f2db1a6cc137ddb633575a337 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Dec 07 11:05:41 2017 -0800 |
| committer | Colin Cross <ccross@android.com> | Thu Dec 07 11:05:41 2017 -0800 |
| tree | ea995b77d262574ea478ade77ce53b5b9baa14f9 | |
| parent | 951ce5c9a089483646fa59f9447023cc9a69e6fa [diff] | |
| parent | 5aa2b69936569a7db6b681c5036bbea2d3146f31 [diff] |
Merge remote-tracking branch 'goog/oc-mr1-dev-plus-aosp' into master Manual clean merge of oc-mr1-dev-plus-aosp to master to speed up the automerger. Bug: 70325521 Test: treehugger Change-Id: I9a4d043d7445208ee8b7a9fb2c9cb8b74c273d65