OSDN Git Service

Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev
authorJorim Jaggi <jjaggi@google.com>
Tue, 25 Oct 2016 23:39:30 +0000 (23:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Oct 2016 23:39:30 +0000 (23:39 +0000)
am: 7e8fc05295

Change-Id: I30c5c07b6b0308e6161607f7e89302d5af8b7c11


Trivial merge