summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Chiachang Wang <chiachangwang@google.com> 2023-08-31 13:07:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-31 13:07:03 +0000
commit0114750137c8a52bb7fa95068582d2297d8324c6 (patch)
treec328ec12112126ba01b72a7f5f7f23e14c8fb4d0 /libs/androidfw/AssetsProvider.cpp
parentf05569fca78a5884aebd9a6ced102e6a1ad6185b (diff)
parentfc79f0d636c8094d715006ab5ff51c34140cbcf1 (diff)
Merge "Validate underlying network when VPN switches to unvalidated" into main am: 4b1ce0f37b am: cb23eff1be am: a3148435ae am: 45a1ae0944 am: fc79f0d636
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2727374 Change-Id: Ic8fb97922a08f9dcbf08615cd36782cbb8bfa036 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