commit | 6fe8ea8b4a5bca5c3a1701eab03ed20a1869d537 | [log] [tgz] |
---|---|---|
author | Daniel Kim <danieljkim@google.com> | Fri Dec 30 12:03:17 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 30 12:03:17 2022 +0000 |
tree | 69f39795c8db7ebe4dadc20d7ea5b2987b861ae9 | |
parent | 621fefef7989ff118a16c9ccf7b2aa64bc586db3 [diff] | |
parent | a308ea5adb28cd9cf27b71c1f12a54e00ec81071 [diff] |
[automerger skipped] Merge "Fix deadlock by not acquiring lock when reporting proximity" into tm-qpr-dev am: 73eea3903e am: a308ea5adb -s ours am skip reason: Merged-In I9f7d520cbcfd57032a9476853acad025fd7a6b95 with SHA-1 a28af297d3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20840409 Change-Id: If52c519e80c8def5cfc071db8f54975681eda69d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>