summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author lucaslin <lucaslin@google.com> 2022-08-25 01:44:25 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-25 01:44:25 +0000
commit753d098990ee576bf5bafef1f516ee56e4a99ca3 (patch)
treeba3b502bde89367eabed3c9186d55711710c3d37 /libs/androidfw/StringPool.cpp
parentb5d0c6b3720a81943418712fb5ef5bc57809d0b1 (diff)
parentb509e1bc563816546a58b80d27ff7de4e92a05f9 (diff)
[automerger skipped] Copy isBypassable flag from VpnProfile to VpnConfig am: f96e5ad580 -s ours am: b509e1bc56 -s ours
am skip reason: Merged-In Ib0fa580bb41dcf67e23b00b79de8e0535e5c15a2 with SHA-1 c43db8b4e6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19682391 Change-Id: Ie0009c1f2e4520b477091534afaa0647d6b851e4 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