summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-08-08 01:35:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-08 01:35:26 +0000
commitc731ba0701cccfd5be314f04fbd41d94c3befbfc (patch)
treea90e4cf5dd41c1e703b48306c317851ccbf9d468 /libs/androidfw/ObbFile.cpp
parentb68fc24119b3fc80a422e5a24ef006896a8990f0 (diff)
parent65b97b1586a3649f5828a17949f2f67a8cecd190 (diff)
Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-dev am: 65b97b1586
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301063 Change-Id: Ic98e8252729089c1ada58aeb7f9f62d4ef2aaeb7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions