tree 9c8e58524a1af22787ead7e7e701e848abee68a4
parent cb731204c47034b6ce3e6a96b127fafc322a3625
parent a714a4a77020303c5ab9464781464bd050110525
author Tim Kilbourn <tkilbourn@google.com> 1437710769 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437710769 +0000

am a714a4a7: am 2f778da1: am 46638832: am a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev

* commit 'a714a4a77020303c5ab9464781464bd050110525':
  Add a wm command to dismiss the keyguard.