diff options
| author | 2022-08-25 06:39:22 +0000 | |
|---|---|---|
| committer | 2022-08-25 06:39:22 +0000 | |
| commit | c9531fa6c6cf641f8314446a222b5231897929ba (patch) | |
| tree | 7e2c72e17a7e9f44e4fe9f5a638eb74869b38691 /libs/androidfw/AssetsProvider.cpp | |
| parent | e9a59c6013b7af48b34c5f2eba78f06741c745bc (diff) | |
| parent | b5fb9726b74a8aaa0f99fda9be2d710382a2fbfc (diff) | |
Merge "Revert "Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CON..."" am: 3ea732de43 am: b5fb9726b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2188655
Change-Id: I49ace854e3a404ec8c3ba6280316f149f17c599a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions