| commit | 0dc2aa27ed744811a5270d22029641195bfa5c61 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Jun 28 14:00:31 2017 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Jun 28 14:00:31 2017 -0700 |
| tree | 5d7bb6bbad1e3dfb07e39a9982ecdbd5eb168108 | |
| parent | 1c12032e37b2ca049022b9b205d64e2a9b26a39e [diff] | |
| parent | 66d9043f9dbd935a6881dd312da5d7dffc90f372 [diff] |
resolve merge conflicts of 712b628d7 to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ibe58b8bd6d55f2d5a875eee689beb920aaa94753