summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Lucas Lin <lucaslin@google.com> 2022-08-25 08:02:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-25 08:02:43 +0000
commit7219ea655306068171e4b634b1f5de9445755efe (patch)
tree938639c7643959891b0e84afbe3616a8f31a7dd9 /libs/androidfw/StringPool.cpp
parentf019512b4549cd56b866c1324bbb8a8c69cbe318 (diff)
parenta6130995d5bc36e09f2690facb84c959a212ebe3 (diff)
Merge "Revert "Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CON..."" am: 3ea732de43 am: b5fb9726b7 am: c9531fa6c6 am: 658d3b0137 am: a6130995d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2188655 Change-Id: I4d7f3be8178a3111f43cf013ac5064c1931dd204 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