tree b1dde73f40c0f5a56fe529549ea54722d892e7ec
parent 5fcd22eebaffb8a29bd32fc5ea336678152a4c1d
parent fa6b70419dcdafca30611176df329f9feee07551
author Cheney Ni <cheneyni@google.com> 1575009721 -0800
committer android-build-merger <android-build-merger@google.com> 1575009721 -0800

[automerger skipped] Merge "Hearing Aid: Remove std::promise from suspend / resume calls, and stop audio ticks by no devices" into qt-qpr1-dev
am: fa6b70419d -s ours
am skip reason: change_id If0b279a191d86b30db41a682dc7f0ad9470cb10e with SHA1 90ba872a72 is in history

Change-Id: I457878603d78c61cb557c7abfd4d940cccdd1025