| commit | 0148ea7b30b0f418a89b1f699d83c8e56407b123 | [log] [tgz] |
|---|---|---|
| author | Pawin Vongmasa <pawin@google.com> | Wed May 17 21:10:57 2017 -0700 |
| committer | Pawin Vongmasa <pawin@google.com> | Wed May 17 21:14:02 2017 -0700 |
| tree | 2b4f5e77f83d594a37737806fa4db8088174345a | |
| parent | 3bf3fd67fdb1ab1cbbd5f1053330c555eea28d6a [diff] | |
| parent | fec50ceef5be99f410de5feaa44494be4e10f4fb [diff] |
resolve merge conflicts of fec50ceef5 to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I9c3440e233196424a88138580c729601cc4cb761