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)
commit53b96948f4369803d42766ec82ac6dda62db5eb1
tree56a1cfd9006776a3a49a60f65de6d004379153e3
parent45956cfa462352d6fe1214741832385c2fa50172
parentff389264d9abd3278247a93d1d518882407f9cfc
Merge "Reset Keyguard when clicking emergency call button" into oc-dev
am: ff389264d9

Change-Id: I557863570a252fc84b76198a4acf0534a55af47c