tree 91925e84e57ab822bcf36efface2d16490e131ea
parent 7deb5ae50c86803c3c2f9aa73a15e5e36c1fba6e
parent 9ad5faa91316bee0b61691a3ff67d37018cc634b
author Xin Li <delphij@google.com> 1632894719 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632894719 +0000

[automerger skipped] Merge "Merge SP1A.210812.016" into stage-aosp-master am: 5ae099b977 -s ours am: 9ad5faa913 -s ours

am skip reason: Merged-In I8b62b9b9d7ae271bc623764d545db1320b4dc64f with SHA-1 6624e2aa57 is already in history

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

Change-Id: I67a30e269da1df1dc163ffd987d64e9cf3368964