summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author lucaslin <lucaslin@google.com> 2022-08-19 16:12:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-19 16:12:28 +0000
commit9f38eb767c89ee2b4045146973c23fc6676bfdf9 (patch)
tree04996c4e816ae558d118966b27b47bb43a643069 /libs/androidfw/StringPool.cpp
parentc54d6a188fdee89adaf84157d80779cb5da3aa37 (diff)
parentb611c83fee6c3c9f3d2102f06de54cb46858b06d (diff)
[automerger skipped] Skip sending VpnManager events for Settings VPNs am: a7ec0cbe45 -s ours am: b611c83fee -s ours
am skip reason: Merged-In I228f62a5e09017dbf985a614f2e42434238a220c with SHA-1 5a684c6362 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19415033 Change-Id: I66d676defdc3ddf944fa414fade064fcac282983 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