OSDN Git Service

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

Change-Id: Ia932db1b7a924c954e38890fe36da66071f72c10


Trivial merge