summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Chiachang Wang <chiachangwang@google.com> 2022-11-16 06:40:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-16 06:40:07 +0000
commit82a07b588f22c21477ef7768aaaa600c98784f65 (patch)
tree30a9f30a35ab185706451269bd18a6e401aa7e7d /libs/androidfw/AssetsProvider.cpp
parent22b69480fe56f4fcdac9065aaf183bbca56235dd (diff)
parent77548273ace88d6afa769e6a16f8ebe215698a28 (diff)
Merge "Set vpn bypassability into VpnTransportInfo" am: 25b16b3d99 am: 77548273ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2291375 Change-Id: Icacbd53c16e09e67b289d342bd3b9876d2d4826b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions