tree 11540a3a84ef44ad582d26d54c6b63d87af3b378
parent 6fe7883f0b164352fb9976d8597e7d0e7b0fe152
parent a35ada4846d3794408825c10ee8a6070a1590044
author Bart Sears <bsears@google.com> 1439448204 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439448204 +0000

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

* commit 'a35ada4846d3794408825c10ee8a6070a1590044':
  Fix Keyguard drawn timeout