| commit | 2099cbac8e64d7d4139a1dfbb0d9b7bf17909ae6 | [log] [tgz] |
|---|---|---|
| author | Pengquan Meng <mpq@google.com> | Mon Aug 26 09:41:18 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 09:41:18 2019 -0700 |
| tree | 1258663cc41f0dbfdaac2955e9eaef48baf3a881 | |
| parent | 5834544053a39f0d5fa4c473b8368cc006b9c7fa [diff] | |
| parent | 8c1e4e80b16926e4ead9931bd213dd1c84d30fc0 [diff] |
resolve merge conflicts of 8f843170a43f7085379ac38afbde7b9f69a16a0f to qt-qpr1-dev-plus-aosp am: 8c1e4e80b1 Change-Id: Ice5bf7947d6539761fc1fb28121eccddb491aa08