am bc7d1d01: am bdc5a45d: am 3ecbd81f: Still trying to fix 2320348 - Launcher2 crashed: AIOOBE at com.android.launcher2.AllAppsView.removeApp

Merge commit 'bc7d1d01640d44c1b4f1b468e6365abc4e340bf3'

* commit 'bc7d1d01640d44c1b4f1b468e6365abc4e340bf3':
  Still trying to fix 2320348 - Launcher2 crashed: AIOOBE at com.android.launcher2.AllAppsView$RolloRS.removeApp
tree: 30d0f982027dd1a3ad4c13e4330d7007e67d6d07
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE