summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Lucas Lin <lucaslin@google.com> 2022-04-13 05:28:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-13 05:28:52 +0000
commita4c15d442d464dbbbbdab79f70e0059b659cebf3 (patch)
tree64fc304d6dfa7763b3e75b3901802f89e294e58e /libs/androidfw/StringPool.cpp
parent9db4acd3420101ec698b5ae833db8d8c4fbaf5bf (diff)
parent46d9f02a15b9839295ab68f258a873535bcd1e85 (diff)
Merge "Add NET_CAPABILITY_NOT_VPN when requesting test network" am: 6ccd0e0503 am: 46d9f02a15
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2062247 Change-Id: I79c2cb0ab47946ced0d01e1f4bcf86a675eb8e8d 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