tree 435d2e7a792392f178d1db3befa14701bee644e5
parent 0cbd7609371f5965341f970e67dc7bd93e982231
parent 33defda53bad07cb3f0bab85a81ab211b1de3c8f
author Yi-an Chen <theianchen@google.com> 1715022993 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1715022993 +0000

[automerger skipped] Merge "Fix security vulnerability of non-dynamic permission removal" into sc-dev am: 9ebd148a18 am: f5b1c57be9 am: 90d37aaee3 -s ours am: 33defda53b -s ours

am skip reason: Merged-In Ia146d4098643d9c473f8c83d33a8a125a53101fc with SHA-1 0ead58f69f is already in history

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

Change-Id: Ia8195639adc55cb1a765bf1b059c9d03b88f0476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>