| commit | 5e1ea7c087a5fac80985b64d6ec19c16be1e06b1 | [log] [tgz] |
|---|---|---|
| author | Tri Vo <trong@google.com> | Wed Oct 18 17:03:42 2017 -0700 |
| committer | Tri Vo <trong@google.com> | Wed Oct 18 17:03:42 2017 -0700 |
| tree | 6b64f912c16fe3baa99260c32104a0063940713c | |
| parent | a2cc681443c03136a02648a234eb618ada08f32c [diff] | |
| parent | d9eec8e4b73286902f3385e24b6828562df73b9d [diff] |
resolve merge conflicts of d9eec8e to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I3be5a3a391e565eb26856fee24b9d06c8ccb8c21