OSDN Git Service

Merge "Reset Keyguard when clicking emergency call button" into oc-dev
authorJorim Jaggi <jjaggi@google.com>
Tue, 23 May 2017 11:10:57 +0000 (11:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 11:10:57 +0000 (11:10 +0000)
am: ff389264d9

Change-Id: I557863570a252fc84b76198a4acf0534a55af47c


Trivial merge