tree 686d3df09c9c78d8689cf04457d9283af97a2986
parent 276a6358eaf2c4e2c943d3016bcda0e31568995d
parent 395f53b799d3d5a2a86efdf43f35eb7446ad8683
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593678248 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1593678248 +0000

Merge "[automerger skipped] hwc2: add locks for callback functions am: 148e622efb -s ours am: bcd32a9950 -s ours am: 0449f62e1f -s ours am: 5cbc702a2f -s ours" into rvc-qpr-dev-plus-aosp