| commit | bd2d5da516763b38d06126439e883f309ca6656a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri May 12 17:43:09 2017 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri May 12 17:43:09 2017 -0700 |
| tree | b131f3b4bd5be5e71237271d21c9262eafd594fd | |
| parent | 538e31abb5b1b0b8f313a8fc6be24df009ff77b5 [diff] | |
| parent | d38ce6ce7c9fc00a21422defb2949760611451e5 [diff] |
resolve merge conflicts of d38ce6ce to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I589f393be9d6ce0cf76afbd39d8e28d3fb6046d9