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
tree: 95104f4ab0db6d38afacaf6ca904c4435c2d099a
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE