OSDN Git Service

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

Change-Id: I53f230e3f9b6aa18c7d8d2ff41542fbd47c3da5c


Trivial merge