| commit | 7729a153658148d3957442bc215406881b464f03 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Aug 03 15:21:45 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 15:21:45 2017 +0000 |
| tree | 5e81643680dc2b0c6475f1e5edca0561142ce99f | |
| parent | 8fe91591034014d32cc5f0cfb465273140fca94c [diff] | |
| parent | e4f542fabf2e98207db8acd1d3fae8e0ddf4fd6b [diff] |
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am: bc3c1d0170 am: 1a9c0c37aa am: e4f542fabf Change-Id: Ia932db1b7a924c954e38890fe36da66071f72c10