commit b346133679f409e3f4e7389c5dced451b9980a57
author Adam Skory <skory@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 b67ee96845fff58ca7279e075d45512d59214051
parent 78d8510a20be87fb4236e93e1a1c4163047151fc
parent 853b55b96e4af7a4f949a22cc084bd333e528c1c

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

* commit '853b55b96e4af7a4f949a22cc084bd333e528c1c':
  Small refactor to separate adding workspace / all apps items
  Fix deprecated EMPTY_ARRAY usage (nanoprotos).

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
+}