OSDN Git Service

Merge "Fix issue where keyguard wouldn't be dismissed" into oc-dr1-dev am: 94f8143129...
authorLucas Dupin <dupin@google.com>
Wed, 9 Aug 2017 17:50:05 +0000 (17:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 17:50:05 +0000 (17:50 +0000)
am: 44db516a20

Change-Id: I08d4bb356ef07c3e325493f51731e3c21e6b1e93


Trivial merge