| commit | 9d63d6b995540c371d6efdc6965343d974b2fc6a | [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 | f0069a8084f6b5cd10ddf3dd6ab59b2103115964 | |
| parent | 35ff106cda5bd33f5ee4dbc0a19b68685fb0fed9 [diff] | |
| parent | ab7bb84e34d09efbd4a386052ad7617800c2e12f [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