tree 7b32c104a85c6843d527957dc1d71a7fcf92849a
parent 17380aef18b364e912621aba034e697c8148f057
parent 813071aa43de6c382db549a748ec30049692c67b
author Joe Onorato <joeo@android.com> 1257812458 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257812458 -0800

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

Merge commit '813071aa43de6c382db549a748ec30049692c67b' into eclair-mr2-plus-aosp

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