tree 1d790a39f67cde08a5028969344e3bd7f93c097b
parent d5cb5d0fea49491d3f5ff6a757574d7be82dcf50
parent ef1dd26ee7b4d8a6ec854bd0b5b9557d67b554f5
author Craig Mautner <cmautner@google.com> 1384384727 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384384727 -0800

am ef1dd26e: am 0e823a45: Merge "Keyguard isn\'t visible if it hasn\'t been drawn." into klp-dev

* commit 'ef1dd26ee7b4d8a6ec854bd0b5b9557d67b554f5':
  Keyguard isn't visible if it hasn't been drawn.