diff options
| author | 2022-05-30 01:44:14 +0000 | |
|---|---|---|
| committer | 2022-05-30 01:44:14 +0000 | |
| commit | 5a41664e4ffae22ea05a097386a49b781b6434c0 (patch) | |
| tree | dc0bce03c5e1089a6acbe4493f53e24cb12a5ad8 /libs/androidfw/StringPool.cpp | |
| parent | 803c856e7b41958a6f38343dbb79e15ed29fb21c (diff) | |
| parent | 2df49c1ac6d237011a4ad56ffed15c16246bde63 (diff) | |
Merge "Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e0e am: de2d849abd am: 4c50bc7922" into tm-qpr-dev-plus-aosp am: 2df49c1ac6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18246032
Change-Id: I938a104ed2fd3a4f0341d9d399aab4ff532a309f
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