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)
commit7729a153658148d3957442bc215406881b464f03
tree5e81643680dc2b0c6475f1e5edca0561142ce99f
parent8fe91591034014d32cc5f0cfb465273140fca94c
parente4f542fabf2e98207db8acd1d3fae8e0ddf4fd6b
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am: bc3c1d0170 am: 1a9c0c37aa
am: e4f542fabf

Change-Id: Ia932db1b7a924c954e38890fe36da66071f72c10