OSDN Git Service

Merge "Don't listen for face when in `lockout` or `lockdown`" into qt-r1-dev
authorRobert Snoeberger <snoeberger@google.com>
Mon, 24 Jun 2019 21:32:39 +0000 (14:32 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 24 Jun 2019 21:32:39 +0000 (14:32 -0700)
am: 16f1032abd

Change-Id: I676b4c2165baeae037836a87619c3791ec093c44


Trivial merge