tree 157917073f9d0be6b1e692d6c130dc26f88f60a4
parent a5ab8308f4be3156295cbaa1ca83b4337972abd5
parent ebde0f1f4083822d8b5b6b6e741daf50f9c4eba2
author Michael Groover <mpgroover@google.com> 1612915531 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612915531 +0000

[automerger skipped] resolve merge conflicts of 540b50bbe7397304436e3bbb63957c0cb265dbce to qt-qpr1-dev am: 8750762ce0 -s ours am: ebde0f1f40 -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: Ifbea49432d86f2b9597532b6bf4a8fe1dd2aedc2