summaryrefslogtreecommitdiff
path: root/libs/androidfw/Asset.cpp
diff options
context:
space:
mode:
author Paul Hu <paulhu@google.com> 2025-03-12 01:45:16 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-12 01:45:16 -0700
commit1b4bce34a0f3f6d1b7da0c8167318ea582a5fe93 (patch)
tree05b2621939230de07306de8a3434f45550df66df /libs/androidfw/Asset.cpp
parentb1d0c8e064c1ea065d9f1990303000eaa73fcb46 (diff)
parentd5c28dd736aa52628af411cc56676ca4cb7fd0e2 (diff)
Merge "Add check to prevent resetting VPN always-on setting in safe mode" into main am: d5c28dd736
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3529966 Change-Id: I3c702092d97d15cb722f5bfc4b195231015f4220 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/Asset.cpp')
0 files changed, 0 insertions, 0 deletions