| commit | a68ce07951aa02243822396c0e80b9d7440b59e7 | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Thu Jun 01 07:05:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 01 07:05:00 2017 +0000 |
| tree | 01d09fe27bbab9668099298467f9718089bc0eb3 | |
| parent | 960354997353c8657e23795b0124ac5848fc1d92 [diff] | |
| parent | 4e49d8d43bfab8867f5c2fbeefc41eaf6f9963e3 [diff] |
resolve merge conflicts of 0e50326a to oc-dev-plus-aosp am: 4e49d8d43b -s ours Change-Id: Idd8c317168378c37e698d3a6f69ffafeace96469