| commit | c3e7e875906a0e52d7969a4d78f746c264b5d747 | [log] [tgz] |
|---|---|---|
| author | Chen Xu <fionaxu@google.com> | Thu Jun 22 19:30:44 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 22 19:30:44 2017 +0000 |
| tree | a438743d83489d2c089ce682253bb288c979eb43 | |
| parent | 45f428c5b9c2b221f879daae02458fdbfb30db58 [diff] | |
| parent | 595ff996dda313b4fa0b0c6549c1a816372b9163 [diff] |
Merge "resolve merge conflicts of 187fe9d5cf3c to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp am: 595ff996dd -s ours Change-Id: Icd656b92302aa8771fededcaab9f6388dedc09f8