tree 0217ec272ae7afb11f2cdf41f49e48cdca593840
parent 1ec04270582d1227b73a1a19291d0e4cf4532e24
parent e043f7edae4333810dedb41c17b3c2f19c80f15b
author Bill Yi <byi@google.com> 1635963944 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635963944 +0000

[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 982bb0f145 -s ours am: e043f7edae -s ours

am skip reason: Merged-In I7e267e3c046d726750180efa81806cbbefb17b68 with SHA-1 65f0c883ff is already in history

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

Change-Id: I9ce2080529fd01792eddcef6297581bbc6f8299d