| commit | 81eba9317bcd9a940a911efd9f89f269ca7378e4 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Aug 03 15:13:27 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 15:13:27 2017 +0000 |
| tree | 05538ea62075a4e3fad94ff77b1cb2a968b721bf | |
| parent | c38b519f7111f67dfb87c48731872c11fd561bc2 [diff] | |
| parent | 2674ad2e9ad95aec4c5cf6f3447a0019e3c98694 [diff] |
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am: bc3c1d0170 am: 2674ad2e9a Change-Id: I7089df088a5c7f684af50ede67dbd11df984fc5d