commit | 1a9c0c37aad35ffbb714e36b320699f10f7c12d8 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Thu Aug 03 15:01:04 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 15:01:04 2017 +0000 |
tree | 43b9b939b832c0402f1c19ee6937f0962807bd7b | |
parent | 03515d0ad252b423c5aa2cdc2c7e56dc71972f14 [diff] | |
parent | bc3c1d0170992c584b569ad689974be84a2b1c35 [diff] |
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am: bc3c1d0170 Change-Id: I598d82fcd14702151a924dd481fa067613c76b0e