diff options
| author | 2022-07-20 13:51:00 +0000 | |
|---|---|---|
| committer | 2022-07-20 13:51:00 +0000 | |
| commit | 260fe481de4a1f083b70c08601668be52d207a75 (patch) | |
| tree | 6295e4316c32ef55442ce3ccb6a3e983d33b9386 /libs/androidfw/StringPool.cpp | |
| parent | fd818a36100ebc98c8be1e494c53f76a0edf82d8 (diff) | |
| parent | 58c079210b5b1a4e96a15e1f44739bbd06545a02 (diff) | |
Merge "Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CONTROL_VPN" am: 41142d7244 am: 58c079210b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2141595
Change-Id: I91a776f26d0c9a33b2c233691d0e80f35b7a8f43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions