diff options
| author | 2022-07-20 14:14:58 +0000 | |
|---|---|---|
| committer | 2022-07-20 14:14:58 +0000 | |
| commit | b1f445ddfe81aa28b828c71e448a9f8b6bf2c99e (patch) | |
| tree | fcb0071547369ae6a0d83c4d9204ecdfa64f9382 /tools/aapt2/ResourceParser.cpp | |
| parent | 27f8e8943b5720bd2c4b1964fd1dc53322764a9c (diff) | |
| parent | 260fe481de4a1f083b70c08601668be52d207a75 (diff) | |
Merge "Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CONTROL_VPN" am: 41142d7244 am: 58c079210b am: 260fe481de
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2141595
Change-Id: I201a0eda5bb8f876fff64a85bbbc566217ddd062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions