summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-05-05 00:44:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-05 00:44:02 +0000
commit22f2f573731ac94f31de5a5c669cce178d1ed81e (patch)
tree640a456dd6382634c98775a61808d73a5d40a41e /libs/androidfw/StringPool.cpp
parentd0383551d06bbf751e48edb36a5ca50d96fe475b (diff)
parent1b4735ab6e7fe0a39e0189ab95804b9c8ff89bf0 (diff)
Merge "Prevent deadlock when releasing VirtualDisplays" into tm-dev am: 1187757cf2 am: 1b4735ab6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17658628 Change-Id: I836dea934e6a833cbc0f2e8735596d49293c3453 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions