| commit | 0ddaa63b6716d40b1d7988e9e224c31472a0d633 | [log] [tgz] |
|---|---|---|
| author | Phil Weaver <pweaver@google.com> | Wed Aug 30 22:54:59 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 30 22:54:59 2017 +0000 |
| tree | e6575beba2ac0fabfb6f6f4051c107aeb2b8fef5 | |
| parent | db61e7ec7305696744bdbc6d4a8b6d44c5952ca4 [diff] | |
| parent | 0784828fb06cd7796c459c09921f814659f5816f [diff] |
Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev