summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Anna Bauza <annabauza@google.com> 2023-07-26 08:47:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 08:47:01 +0000
commit38f259430cdce785b8c6cf50567cacc4f4525a93 (patch)
tree8f95a67dac85168b5c3eb5627665b1a484aa96b9 /libs/androidfw/AssetManager2.cpp
parent03c53712eaa98b3fc7b2dbfe1f1e3bd5f5f0a993 (diff)
parent36680dc6314913660445425849c087f8b5258e24 (diff)
Merge "Fix settings crash by removing potential deadlock in setDefaultGuestRestrictions" into udc-qpr-dev am: 36680dc631
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23878891 Change-Id: I5dc0a51c314df4bf93ff03f15c890aa06a7cc642 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions