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