| commit | 5745f4749c6fb28c61c5ab54a9ce881e85b2ec30 | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Thu Mar 19 18:46:42 2020 +0000 |
| committer | Roshan Pius <rpius@google.com> | Thu Mar 19 18:46:49 2020 +0000 |
| tree | f480f446989c517188464859fd68c63f00ec093d | |
| parent | bad68f2de7853a1080bda14b0adc820962e3b957 [diff] | |
| parent | 2e69e4fec552b721dd883c73d36a9e910da563d9 [diff] |
resolve merge conflicts of 2e69e4fec552b721dd883c73d36a9e910da563d9 to qt-qpr1-dev-plus-aosp Change-Id: I409269dab5e47e22573833c3ae137aa192f20386