tree 95104f4ab0db6d38afacaf6ca904c4435c2d099a
parent deb98afe40cd1b6f1c042492e56b48b29320a134
parent 96ef9f68a43604c99cd18537a6c8e9d1c5049c31
author Joe Onorato <joeo@android.com> 1266880036 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1266880036 -0800

am 96ef9f68: am bf5350db: fix 2460740 com.android.launcher2: java.lang.NullPointerException at com.android.launcher2.AllAppsView.saveAppsList(AllAppsView.java:1270)

Merge commit '96ef9f68a43604c99cd18537a6c8e9d1c5049c31'

* commit '96ef9f68a43604c99cd18537a6c8e9d1c5049c31':
  fix 2460740 com.android.launcher2: java.lang.NullPointerException at