tree 332306a51ff743e6b84dfbf1a31baaed1335923a
parent 9f886e19ea5f5f312d52a06ed77218fdaeaefc9d
parent aad5f9e943479e9e6cb5e882bff99decb097a246
author Joe Onorato <joeo@android.com> 1257812775 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257812775 -0800

am aad5f9e9: am 813071aa: am e6168662: Fix bug 2242465 - Can add shortcuts while the "3d all apps" is open.

Merge commit 'aad5f9e943479e9e6cb5e882bff99decb097a246'

* commit 'aad5f9e943479e9e6cb5e882bff99decb097a246':
  Fix bug 2242465 - Can add shortcuts while the "3d all apps" is open.