diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-02-08 17:23:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-08 17:23:08 +0000 |
| commit | 2fffbcb7dfafdb61e2f0265e8265f66985c63147 (patch) | |
| tree | a8699091e6d8d6ee50f51ca53e022fcee78a9d35 | |
| parent | 24a1d2c990d7ae59d14a78b769dfc64da5cf3819 (diff) | |
| parent | 6d4ff2e0f04abdcaa40e3261aa714204c0735a89 (diff) | |
| download | base-2fffbcb7dfafdb61e2f0265e8265f66985c63147.tar.gz | |
[automerger skipped] Merge "resolve merge conflicts of a13fc7f314ac56e75eca09c94db8090f928023ff to qt-qpr1-dev" into qt-qpr1-dev am: 6d4ff2e0f0 -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: I409002a313787764b16cb23080c38e9273104638
0 files changed, 0 insertions, 0 deletions