tree 0c414b6e1f0f8c3ae2f549086160ba60cc49a633
parent c9cc6907ac7d33f77675e93eeb0833deb3ed117c
parent a4738bdbd2d310842bc55aecfcd5105ade83e146
author Jim Miller <jaggies@google.com> 1381907626 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381907626 -0700

am a4738bdb: am 7c95ae91: am 67fc6b0b: Merge "Fix issue where keyguard reports a valid token but doesn\'t draw" into klp-dev

* commit 'a4738bdbd2d310842bc55aecfcd5105ade83e146':
  Fix issue where keyguard reports a valid token but doesn't draw