commit 6508fe1b07ec888012255e3a2438382b45a9707f
author Anton Hansson <hansson@google.com> Thu Mar 20 01:12:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 20 01:12:54 2014 +0000
tree 42a32d060a674728d8f067f27b36a32b2adae11e
parent b346133679f409e3f4e7389c5dced451b9980a57
parent d0642c4274abcbede9177d61b0f072689db889a9

am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit 'd0642c4274abcbede9177d61b0f072689db889a9':
  Fix NPE in when dropping from all apps (issue 12917451)
  update placeholder on package install or restore

src/com/android/launcher3/LauncherClings.java

diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index 9d2778c..00711fe 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -453,4 +453,4 @@
         dismissCling(cling, null, FOLDER_CLING_DISMISSED_KEY,
                 DISMISS_CLING_DURATION, true);
     }
-}
\ No newline at end of file
+}