tree e710b21c4b5ef80e65cf394d45f5130aee175e1d
parent f679b81026b91ea0526ca1428ad3483f737c5698
parent 4ed32c248a70fb3ab4d36def8f73e5b88b7fc3d5
author Michael Jurka <mikejurka@google.com> 1354233494 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354233494 -0800

am 4ed32c24: am d2de8033: am a8d63ec9: Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev

* commit '4ed32c248a70fb3ab4d36def8f73e5b88b7fc3d5':
  Disable adding keyguard widgets until setup is done