| commit | 97646fd3d706ffc1e6ee4db76497ab38de8cb021 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Feb 08 18:34:37 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 08 18:34:37 2021 +0000 |
| tree | 97cef26c76a1a9b2da44236adafcd5a884100d8a | |
| parent | fccde53e0aa75aa9c3530dccd4db47f271979aea [diff] | |
| parent | ed6a63240fc3c22a727c06214eb53117edb83f8a [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 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: I8c69b86e015985b902508a3f6933ddaf12a24d6c