tree 51eb7ffb7f9e4fd2de0a7308eb3d8fde499636bf
parent c87ba471bc570519e5f1e01d713fa228c65f9ecb
parent 711ea1e5e25eaaf7bb1eb4ffb63ef08b339f61f2
author Jorim Jaggi <jjaggi@google.com> 1412439236 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412439236 +0000

am 711ea1e5: am 23f07789: am 3c6300da: am eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev

* commit '711ea1e5e25eaaf7bb1eb4ffb63ef08b339f61f2':
  Fix blank Keyguard #4