| commit | b5768ba3268deb18d291a1743d1580449b463e69 | [log] [tgz] |
|---|---|---|
| author | Pawin Vongmasa <pawin@google.com> | Thu May 18 06:20:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 18 06:20:13 2017 +0000 |
| tree | 430bf14bc828e5f58a7241c0097c10e047fd2927 | |
| parent | d84490ddcc19ade3a6d46ade93c721e5eb8515af [diff] | |
| parent | 65d96f774d9a01fd54fd2b3fbfaf21036ba321e6 [diff] |
resolve merge conflicts of 76f1cf0faa to oc-dev-plus-aosp am: 65d96f774d -s ours Change-Id: I3a802bda10c70c519d1dce2ff2da86f49cc2853f