| commit | 6d35950b360568ff3937ceecbf04bc1ad8bbf5a6 | [log] [tgz] |
|---|---|---|
| author | Luke Song <songwalker@google.com> | Wed Jul 19 18:25:31 2017 -0700 |
| committer | Luke Song <songwalker@google.com> | Wed Jul 19 18:25:51 2017 -0700 |
| tree | 8fe3275856fa8d4575ca689e4c9b848733766931 | |
| parent | 98808439f02c79cfd126cac982bde2df35d1ffe6 [diff] | |
| parent | 26ac29596104f02498be2fc321dc4d4d448ec60c [diff] |
resolve merge conflicts of 74a5f22d9 to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Iad367b2998311e327151dbd8e9295259f6661f77