summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-05-14 16:04:13 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-05-14 16:04:13 +0000
commit2621c236e1558a15984e614487366e7e23d3e0c5 (patch)
treeaf649f46a4129a022e299fee17aeac094e6b25b7 /libs/androidfw/ObbFile.cpp
parent693932db1e60c5cfe342ed85dcf2187399596b2e (diff)
parentbd0a82642b82621d9eaceb3f3cf18cbd819137fa (diff)
Merge changes from topic "am-bfc711551fdd4bf2bccf09137dd3a572" into main
* changes: [automerger skipped] Merge "Add the thread-safe protection for PowerAllowlistBackend if possible" into 24D1-dev am: 9e267f728d -s ours [automerger skipped] Add the thread-safe protection for PowerAllowlistBackend if possible am: da0da5ab92 -s ours
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions