Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release

at a4db090b1345038a89a38ba8af6ac74f71e2ed7c
diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index 94b062d..1745e31 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -452,4 +452,4 @@
         dismissCling(cling, null, FOLDER_CLING_DISMISSED_KEY,
                 DISMISS_CLING_DURATION, true);
     }
-}
\ No newline at end of file
+}