summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Lucas Lin <lucaslin@google.com> 2022-08-19 09:42:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-19 09:42:27 +0000
commit8048f8bbe9cddb359dba97c2ccad402f47bb633d (patch)
tree0db294905586ccbab06eca606a7dcb2c9878188a /libs/androidfw/StringPool.cpp
parentd37883f6bf19924a3142e6c5e155e11d994a90f1 (diff)
parent32b243659731c92156131b3d659176e76f271ad4 (diff)
Merge "Copy isBypassable flag from VpnProfile to VpnConfig" am: 32b2436597
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2189315 Change-Id: Ieb610574626d4920fe7e13027b23cf9fd512e051 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