tree 4823498351617b9f46a7cfc5b4be9db8c4ddcd21
parent 30839ce439893a7183f6711abf730c60c87a2b3a
parent 69935f9a053a14da8677b5957bf72ad1746ebad8
author Jim Miller <jaggies@google.com> 1418358900 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418358900 +0000

am 69935f9a: am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev automerge: 0ca6b7f

* commit '69935f9a053a14da8677b5957bf72ad1746ebad8':
  Attempt to fix keyguard missing bug