OSDN Git Service

Merge "Merge "Assist: Only call lockscreenShown when it is actually shown" into oc...
authorAdrian Roos <roosa@google.com>
Thu, 3 Aug 2017 15:26:17 +0000 (15:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 15:26:17 +0000 (15:26 +0000)
am: 248673e94f

Change-Id: I550c0b28dfcd9f9a34bb02f666d88dbd5882f200


Trivial merge