tree b658456f2658bd1696a70d7bded73c99aa457a06
parent 2f553cb405494dba91997001c87763c213e752ac
parent ada5fb65b5f4ae51fb81f24847a8837037503893
author Daniel Norman <danielnorman@google.com> 1630350718 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630350718 +0000

Merge "Allow APEXes permission XMLs to declare features." am: ada5fb65b5

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

Change-Id: I2385e0b45e15f204382ec5eeee24ce3d62b17064