| commit | e4f542fabf2e98207db8acd1d3fae8e0ddf4fd6b | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Aug 03 15:10:36 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 15:10:36 2017 +0000 |
| tree | 05538ea62075a4e3fad94ff77b1cb2a968b721bf | |
| parent | c38b519f7111f67dfb87c48731872c11fd561bc2 [diff] | |
| parent | 1a9c0c37aad35ffbb714e36b320699f10f7c12d8 [diff] |
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am: bc3c1d0170 am: 1a9c0c37aa Change-Id: I0af701dfcab068695c3cfcf746b4e23694c20f60