| commit | 0ebf14fd61ee0c71292abd3d521ccbdf7e7a377e | [log] [tgz] |
|---|---|---|
| author | Max Bires <jbires@google.com> | Wed Aug 18 02:21:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 18 02:21:14 2021 +0000 |
| tree | a6aecc0be08ededf6995fef5e01e4bd817bd0dbb | |
| parent | 7cbdfa67c2ccd515ee1b1e45ef18abea275e5f82 [diff] | |
| parent | f5e0c3e2571a31ca1c06a4146c8db46242590052 [diff] |
[automerger skipped] Merge "Fixing a condition that can cause deadlock" am: 773a378390 am: f5e0c3e257 -s ours am skip reason: Merged-In I630a0ef2560a8ebd962de54c65e3d6277133a1cb with SHA-1 9b1e1c4c08 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1797475 Change-Id: Ic89e2f43aa5cf829fa3cf6c0dd090c7ffe10ac2e