tree ddb811082c8032ff55e2b5eb2a11052885dc3ea7
parent ed0cd48ee07baaec9ac6a567c8d402fcb3be7522
parent ed8620ae022e63fe85e2ddce4114e49457163a77
author Alex Salo <asalo@google.com> 1559106576 -0700
committer android-build-merger <android-build-merger@google.com> 1559106576 -0700

Merge "Don't run AttentionDetector when wakelock is held" into qt-dev
am: ed8620ae02

Change-Id: I28b9770a60a5ddbcc44449401e078c2dc651a0e2