summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Lucas Lin <lucaslin@google.com> 2021-12-27 17:51:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-12-27 17:51:08 +0000
commit4713bc76f6a6df82866f5cfc70493998dafaec8e (patch)
treee332aa4b5b2f3ae0a943d333346edee7e0964194 /libs/androidfw/StringPool.cpp
parentf12c70b8b271ef9d5453453aff1d31fbf213d755 (diff)
parent860a03cf15b832c7c0ef01e4d477e2467a29a94b (diff)
[automerger skipped] Merge "Prevent an app to check if the specified VPN app is set VPN always-on" into sc-dev am: 34137fbbff am: 4718cfc880 am: 860a03cf15 -s ours
am skip reason: Merged-In I0013039f58a6f7c5c73b9acc877d70a0126d0ca7 with SHA-1 46eb3bead1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15501962 Change-Id: I1c6bec859a2ce21eed9e007b98f6d2061def8050
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions