tree 1abe035561668a5713eeaaefa9fcf72969819eb6
parent bd2b9725e0343103ca7e2f76ccee03ba26f6c2b6
parent 13775aa4bbe612287414571e6581770c0be9d750
author Lucas Dupin <dupin@google.com> 1561623998 -0700
committer android-build-merger <android-build-merger@google.com> 1561623998 -0700

Merge "Avoid stuck wake-locks" into qt-dev
am: 13775aa4bb

Change-Id: I0db38fdb7a757510f1f24d981c66b387c6596871