| commit | 8c1e4e80b16926e4ead9931bd213dd1c84d30fc0 | [log] [tgz] |
|---|---|---|
| author | Pengquan Meng <mpq@google.com> | Mon Aug 26 00:18:52 2019 -0700 |
| committer | Pengquan Meng <mpq@google.com> | Mon Aug 26 00:18:52 2019 -0700 |
| tree | 17a7f4c24642c5f1e0829b353555bcf09af49f8c | |
| parent | b402c73c4d5273fca9f67cddbb217958d351721c [diff] | |
| parent | 8f843170a43f7085379ac38afbde7b9f69a16a0f [diff] |
resolve merge conflicts of 8f843170a43f7085379ac38afbde7b9f69a16a0f to qt-qpr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I52368e2d4d0585bb4a3b9401f6b268408952fcc6