| commit | db8870065ad706e9ea66520879da9a3fa82ec6ae | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Thu Jun 15 13:41:14 2017 -0400 |
| committer | Jason Monk <jmonk@google.com> | Thu Jun 15 13:41:14 2017 -0400 |
| tree | cb886e75a6bf6270d899fedffb5ac35d1588b690 | |
| parent | c31da7a282ad24ec75caacfc9084eacc0bc5d843 [diff] | |
| parent | 8c1e6e49f95ba6c588f87ef324eed98480fa9b8c [diff] |
resolve merge conflicts of 8c1e6e49f95b to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: If41b96601018976c8f5a5ea8d124bc0abb4ef605