| commit | cfe09d4e228cd4ac95f1183b86f3fc36abdc1d47 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Feb 08 18:35:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 08 18:35:21 2021 +0000 |
| tree | a30917b9dba168da02426f400172a8db9273c6f7 | |
| parent | 98ed521f0a51f50cfccf08997453a7c0be2fe4ec [diff] | |
| parent | a5ab8308f4be3156295cbaa1ca83b4337972abd5 [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: a5ab8308f4 -s ours am skip reason: Change-Id I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 296fea7448 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13464421 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0425623f67c9b1913375adabcb04cf04b5147306