diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-02-08 17:48:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-08 17:48:54 +0000 |
| commit | a5ab8308f4be3156295cbaa1ca83b4337972abd5 (patch) | |
| tree | 157917073f9d0be6b1e692d6c130dc26f88f60a4 | |
| parent | 98807ed3a72bfd4a0fd035a06f24d84169bce5a2 (diff) | |
| parent | 2fffbcb7dfafdb61e2f0265e8265f66985c63147 (diff) | |
| download | base-a5ab8308f4be3156295cbaa1ca83b4337972abd5.tar.gz | |
[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 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: I51c19517a358f1f8cc69bdf18f00d99cdf05c573
0 files changed, 0 insertions, 0 deletions