tree 0b0a9bec65b772cc7696f4c0ea34e35377126625
parent af958dce341b0046808d544a040445bd2941f6a1
parent 5a0f5ba269c12889246acbbe546ef75285231430
author Adam Cohen <adamcohen@google.com> 1353020536 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353020536 -0800

am 5a0f5ba2: am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev

* commit '5a0f5ba269c12889246acbbe546ef75285231430':
  Making sure launcher doesn't show keyguard-only widgets (issue 7550090)