commit | 2674ad2e9ad95aec4c5cf6f3447a0019e3c98694 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Thu Aug 03 15:01:12 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 15:01:12 2017 +0000 |
tree | c0579bd6ce827729b8ac0ebd58d3042b96d3e88b | |
parent | a3c00447b72c68de5bf7a47222590b08fe630e17 [diff] | |
parent | bc3c1d0170992c584b569ad689974be84a2b1c35 [diff] |
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am: bc3c1d0170 Change-Id: Id87a35597db82345e564fd4d92500b8dacdc0c23