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:01:12 +0000 (15:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 15:01:12 +0000 (15:01 +0000)
commit2674ad2e9ad95aec4c5cf6f3447a0019e3c98694
treec0579bd6ce827729b8ac0ebd58d3042b96d3e88b
parenta3c00447b72c68de5bf7a47222590b08fe630e17
parentbc3c1d0170992c584b569ad689974be84a2b1c35
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev
am: bc3c1d0170

Change-Id: Id87a35597db82345e564fd4d92500b8dacdc0c23