tree 644abf15d020a6413b41901aa58285c0956eeefc
parent 630be43c1c6b9c3774708a69e7db1f0e50e27abb
parent 54bc30df5a0211a026e5f804b3ea26dd6a626723
author Bart Sears <bsears@google.com> 1439448915 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439448915 +0000

am 54bc30df: am a35ada48: am 3ab3ffc6: am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev

* commit '54bc30df5a0211a026e5f804b3ea26dd6a626723':
  Fix Keyguard drawn timeout