commit | c740100d0ebacdb3c464ddf5cc379293f5491701 | [log] [tgz] |
---|---|---|
author | Ayush Sharma <ayushsha@google.com> | Wed Sep 06 12:46:24 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 06 12:46:24 2023 +0000 |
tree | 1bacffaf08a085c23c182387105aef1d6be2c738 | |
parent | 00a6c2e8682c0a9c0137357df9c5d6619d67bb9a [diff] | |
parent | c9d1b984ea41d5e05c1907e17702ef375328fbab [diff] |
[automerger skipped] Merge "Fix deadlock between DPMS and AMS" into udc-qpr-dev am: 0a40bc7e77 am: c9d1b984ea -s ours am skip reason: Merged-In I0aa2e397ac49d90b5f89ba10e11cab665cc2e915 with SHA-1 058ebf6e40 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24446636 Change-Id: I61774c5b792202f277c0ba88734dac6f3dcb850c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>