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