| commit | 5d24c2c214be9776d4da3c7638515dda55b7b21e | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Mon May 15 15:21:01 2017 -0700 |
| committer | Jordan Liu <jminjie@google.com> | Fri Jun 09 17:15:27 2017 -0700 |
| tree | 68ddfaca0e58afc1933064afd55f8738fc1c2d22 | |
| parent | 4918865ef5dfb36aee512f69900d00dac020d9b1 [diff] |
Fix merge conflict from oc-dr1-dev to oc-dr1-dev-plus-aosp Change-Id: I17e6fd3016577594d9e7ded18cf4d3ef86530bbf