| commit | 4527721e85a3440e32ec92e579da514af8c0696c | [log] [tgz] |
|---|---|---|
| author | Jin Qian <jinqian@google.com> | Thu Jul 20 16:57:18 2017 -0700 |
| committer | Jin Qian <jinqian@google.com> | Thu Jul 20 16:57:18 2017 -0700 |
| tree | 61985030cbb3d27f378d9a10024b889194730207 | |
| parent | 9abc85f05b202bac7daf6feaf562dbe9456f37c2 [diff] | |
| parent | 559caf2538b2f6574cbe275bc69ba68b62a6cc4b [diff] |
resolve merge conflicts of 559caf25 to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I61f764a10a873952bfa5a5cda8468ba4dee785d0