tree 95296e955e70ccb4142767fca81ae4ad40113f8b
parent bebc68c54bf5fe1f499940f16f465dd7feacb03e
parent aa85aac5e25a3248fca488228718103da419e8d4
author Christian Wailes <chriswailes@google.com> 1559956895 -0700
committer android-build-merger <android-build-merger@google.com> 1559956895 -0700

[automerger skipped] Merge "Fixes two data races in USAP pool management." into qt-dev-plus-aosp am: bc5237a4f1
am: aa85aac5e2 -s ours
am skip reason: change_id Ie01637a10b356b80b5aa62291a97f2c167242827 with SHA1 fb329ba7c8 is in history

Change-Id: I2a157215625574c56c0be973ee2e74dfc1328c4d