tree c3eeb45435ae3a3d02ddce15eb90ea6062ae30d3
parent 7e3757499790a5a455d7b09bd12a0407aefd6c86
parent 2b3dbdd95bae3dfd3e1201919f5a4a92dc0a5206
author Daniel Norman <danielnorman@google.com> 1630351945 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630351945 +0000

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

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

Change-Id: I1f429e9506dc522cc29d3b4ecba8b33d6982eb55