summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Anna Bauza <annabauza@google.com> 2023-07-26 07:36:02 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-07-26 07:36:02 +0000
commit36680dc6314913660445425849c087f8b5258e24 (patch)
tree706105566bd630bd5c63faef5a513f0d17606fcf /libs/androidfw/AssetManager2.cpp
parent1139a889d539b215acd6b69e380a94075cb2da06 (diff)
parent1004e773f64ee89c1c02f8088602f5f50bec3f56 (diff)
Merge "Fix settings crash by removing potential deadlock in setDefaultGuestRestrictions" into udc-qpr-dev
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions