summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Cassie Wang <cassiewang@google.com> 2023-06-19 12:12:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-19 12:12:57 +0000
commit2cb4db028b9ad3e2d7a62de4268f8569aea4bfaa (patch)
tree352950fcdc109aab78b201b56d5830a33aaf5490 /libs/androidfw/StringPool.cpp
parent9b53553c806555371bee42d76e24dec57a844241 (diff)
parent6460d464c31d22ed444498c28b313d9512546853 (diff)
Merge "Allow any caller with CONTROL_VPN to disconnect existing VPN" am: 6460d464c3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2624101 Change-Id: I0282312b719a848181a6be0d3229efe20507f3c2 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