tree 697835f044a7658b8d89fe9b3f83dbfb403f0820
parent e775cee1763610a0be6ad89baefdea5714cd9952
parent 3ef8f64d3faac1b110c737e69472be710d07d158
author Jim Miller <jaggies@google.com> 1365639911 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365639911 -0700

am 3ef8f64d: am 5c58a916: Merge "Fix missing clock in keyguard" into jb-mr2-dev

* commit '3ef8f64d3faac1b110c737e69472be710d07d158':
  Fix missing clock in keyguard