summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Chiachang Wang <chiachangwang@google.com> 2022-11-16 19:07:17 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-16 19:07:17 +0000
commit560f392728a32301da13aafe59c9e2510edc796c (patch)
tree50f2a986c65e8ada7b0420db0a6ee7d096f946bc /libs/androidfw/AssetsProvider.cpp
parentd46b303e08ede83947e6dc060c5366c746ee45b7 (diff)
parent82a07b588f22c21477ef7768aaaa600c98784f65 (diff)
Merge "Set vpn bypassability into VpnTransportInfo" am: 25b16b3d99 am: 77548273ac am: 82a07b588f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2291375 Change-Id: I61173e5780146084d612bd70a7c36cd0bc53e136 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