| commit | bb63856791ad1fc090cf25f739d480e344f34907 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Feb 08 21:36:31 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 08 21:36:31 2021 +0000 |
| tree | 45060823652c20a224ee9d7d8023a954e9f42e5e | |
| parent | 15c8bf6793f3ca582cbb5b285f3fbdaf86e2cc76 [diff] | |
| parent | 97646fd3d706ffc1e6ee4db76497ab38de8cb021 [diff] |
[automerger skipped] Merge "resolve merge conflicts of a13fc7f314ac56e75eca09c94db8090f928023ff to qt-qpr1-dev" into qt-qpr1-dev am: 6d4ff2e0f0 -s ours am: 2fffbcb7df -s ours am: ed6a63240f -s ours am: 97646fd3d7 -s ours am skip reason: Change-Id I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 a13fc7f314 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13464421 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I65ca91b73505f562ff7377b9c761bac7818ba350