| commit | 72e5429f1af225f3284010e1a6cdaf6f687bbfeb | [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 | ebdea0ad1b53a7716443610dc5f04e1d85d8cd06 [diff] | |
| parent | 712b628d701108d68eab2ffc6121c2eadcfa077b [diff] |
resolve merge conflicts of 712b628d7 to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ibe58b8bd6d55f2d5a875eee689beb920aaa94753