summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Anna Bauza <annabauza@google.com> 2023-07-26 09:30:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 09:30:54 +0000
commitb10a8e4e03dbe1c9843c4884cc93665c2b89f289 (patch)
treeb49d8aec3bfede6b3e4a20c4df0dfe3783830b43 /libs/androidfw/ObbFile.cpp
parentcd59ed7653e92ca697b42fc818cdf339c34b9b4f (diff)
parent38f259430cdce785b8c6cf50567cacc4f4525a93 (diff)
Merge "Fix settings crash by removing potential deadlock in setDefaultGuestRestrictions" into udc-qpr-dev am: 36680dc631 am: 38f259430c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23878891 Change-Id: I4ed1aaa950c9f8a864c9bfc14411282f342ed027 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