| commit | 056a5ca9d244583ca47b9c7e2fb05e8b92113248 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 04 02:23:46 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 04 02:23:46 2020 +0000 |
| tree | 24e2aa1d970405eaf7b3e0196c864ed5b0af2949 | |
| parent | 99e390e9af80fc10f651bbf1dd78ed19737cf4c0 [diff] | |
| parent | e0c957be368e8989879dad7b086430b4fe9dd969 [diff] |
[automerger skipped] Merge "resolve merge conflicts of 01f94b7cc053049a472481f457593d895ad9eca0 to qt-qpr1-dev" into qt-qpr1-dev am: 25f9b23c6a -s ours am: e0c957be36 -s ours am skip reason: Change-Id I34d1d5f9a751c1d7680a5a5941c39b9fe33a473b with SHA-1 44d1c652ce is in history Change-Id: I989edca4c099684898b0c9fa96bb16dfdedcd75d