tree 0afe26ccec23d8b6d5da170f6dfe3e23cc56a3f4
parent a7e45e364ca42b4a759a4ef86fd8d7dc7230224a
parent a9d7fcdbf2917c7c9a9af932951b5efc077e41c1
author Jorim Jaggi <jjaggi@google.com> 1495537461 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1495537467 +0000

Merge "Reset Keyguard when clicking emergency call button" into oc-dev