| commit | 8ffe7b76acda07a09a9c2a9eec1eb3d0c1542763 | [log] [tgz] |
|---|---|---|
| author | Mark Ashdown <ashdown@google.com> | Fri Jan 17 12:15:16 2014 +0000 |
| committer | Mark Ashdown <ashdown@google.com> | Fri Jan 17 12:17:52 2014 +0000 |
| tree | d01cf0d5bb529ba0d27a93e06f9c46f144882829 | |
| parent | 71c92b356099c90d52a848981855be3fef5c895f [diff] | |
| parent | f8584042713aad82f9d057ecaace8a9ad1aad0bc [diff] |
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release Conflicts: src/com/android/launcher3/LauncherClings.java Change-Id: Idd2e6d54180315854216cfc868cd36297dcb95d9
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 +}