| commit | 0bc6b1e81239aa3c99d8351c81ad5517023e1fad | [log] [tgz] |
|---|---|---|
| author | Joanne Chung <joannechung@google.com> | Thu Nov 09 03:21:40 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 09 03:21:40 2023 +0000 |
| tree | c0ba24d2bcc5ba3c3b635b7cd9c2579fcf1696f6 | |
| parent | f59363b2c475f066a6af25e84aba30ad2fb7b2af [diff] | |
| parent | 122028a4d7604fda316868c65d2691675ed1d394 [diff] |
[automerger skipped] Merge "Fix deadlock between PackageManager and DisplayManager" into main am: 92e95adbec am: aa27b99496 am: 122028a4d7 -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: I2b93fd739967e55f584d04892553f08588e16c71 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>