tree a8699091e6d8d6ee50f51ca53e022fcee78a9d35
parent 2fffbcb7dfafdb61e2f0265e8265f66985c63147
parent 8750762ce0f4c55f5bb262f5e0a9ba96098d26d2
author Michael Groover <mpgroover@google.com> 1612914002 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612914002 +0000

[automerger skipped] resolve merge conflicts of 540b50bbe7397304436e3bbb63957c0cb265dbce to qt-qpr1-dev am: 8750762ce0 -s ours

am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a953322575 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13518142

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id982e8e6f2931509943c5d8e0f77202d04183c9e