tree c244b7e78d0d22c4a884228fc1ef4c9db8690e7b
parent 0acd9c8fdbb4a555b768f5aefd5e1b7cf2470e8a
parent 90b64ddd97496088a8c6de7c976945fd658d794a
author Alex Salo <asalo@google.com> 1559940129 -0700
committer android-build-merger <android-build-merger@google.com> 1559940129 -0700

Merge "Don't check attention when in lockscreen" into qt-r1-dev am: fce768e553
am: 90b64ddd97

Change-Id: Id6ead3e1ef36f7eaa379437ab0d8e9098628b435