| commit | f59363b2c475f066a6af25e84aba30ad2fb7b2af | [log] [tgz] |
|---|---|---|
| author | Joanne Chung <joannechung@google.com> | Thu Nov 09 03:17:56 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 09 03:17:56 2023 +0000 |
| tree | c0ba24d2bcc5ba3c3b635b7cd9c2579fcf1696f6 | |
| parent | 37f94a7eac44028e89df7ef52294339b6de96176 [diff] | |
| parent | 8fcf2d6f639f94222e7eed8e763ada959fafb1bc [diff] |
[automerger skipped] Merge "Fix deadlock between PackageManager and DisplayManager" into main am: 92e95adbec am: c67eaa4542 am: 8fcf2d6f63 -s ours am skip reason: Merged-In I3dea7b1df6f115d7c1cffda6a9d51070a5d7dd80 with SHA-1 1e7589afb3 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2821210 Change-Id: Ib03080138bac1da4a2709b54f1819e6cf11b2403 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>