summaryrefslogtreecommitdiff
path: root/libs/androidfw/Asset.cpp
diff options
context:
space:
mode:
author Paul Hu <paulhu@google.com> 2025-03-12 02:09:10 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-12 02:09:10 -0700
commit371837b50305ec097ee6a46ac6cf1adbf9d0fbe0 (patch)
tree88ce4dea98cd659aab91c582ddd716b72b00ec6f /libs/androidfw/Asset.cpp
parent80a4b1a6fe2638dfbd9317ac3f26920656825800 (diff)
parent1b4bce34a0f3f6d1b7da0c8167318ea582a5fe93 (diff)
Merge "Add check to prevent resetting VPN always-on setting in safe mode" into main am: d5c28dd736 am: 1b4bce34a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3529966 Change-Id: I8086599a741527e98a6d88efe0982a5db472883d 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