tree beb51d6b3d1a27774590d479b6af424bf2532a30
parent 8b693036da4a0571260e529263080c8eb1625b84
parent f2a6ef18c55334a311dca09cab844f87a07d98f8
author Joe Onorato <joeo@android.com> 1256852614 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256852614 -0700

am f2a6ef18: am 010acca4: am 664457db: Fix 2200739 - Crash when you click on an empty icon slot in 3d all apps

Merge commit 'f2a6ef18c55334a311dca09cab844f87a07d98f8'

* commit 'f2a6ef18c55334a311dca09cab844f87a07d98f8':
  Fix 2200739 - Crash when you click on an empty icon slot in 3d all apps