summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Jean Chalard <jchalard@google.com> 2023-07-06 06:08:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-06 06:08:33 +0000
commita23c5d4dbf396d0b5d345380fd742455eabf35ad (patch)
treea31ed9c0a7e0119c3b1d66859983fe02c7d81b20 /libs/androidfw/ApkParsing.cpp
parentc1e4ecdec2b5ab599129471c670a3dccb9e9a9a9 (diff)
parentad9af58ec169a66366b1b92ce92f2f4764105070 (diff)
[automerger skipped] Merge "Perform VPN data stall recovery on unvalidated VPN network" into udc-d1-dev am: 65f865f847 -s ours am: ad9af58ec1 -s ours
am skip reason: Merged-In Ibb8197a689220db5868f351bffa9ac27334355e2 with SHA-1 b4f300d70d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23911103 Change-Id: I4d1c3c41386b3335fbd3b61c2cca0b8327ba52d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions