| commit | 9d5a66feb3edfc3e3acb7a869540ccde178f0266 | [log] [tgz] |
|---|---|---|
| author | Paul Scovanner <pscovanner@google.com> | Thu Nov 05 18:49:45 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 05 18:49:45 2020 +0000 |
| tree | faca75a2f05e4aeb99749f67158142ffa5612714 | |
| parent | 29d48ffac57b569a9b5822b59a906f776136deb0 [diff] | |
| parent | 952f59cccde14971c9199d2f906ddd82dff5e6dd [diff] |
[automerger skipped] resolve merge conflicts of 47ba91cd62e20c0f1d0e03ca1df6abb97c7c9cd9 to qt-qpr1-dev am: 952f59cccd -s ours am skip reason: skipped by user pscovanner Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12992996 Change-Id: I2a8c940a112c54a90de0972d1f08a86f46d347ad