diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-12-04 10:04:54 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-12-04 10:04:54 -0800 |
commit | 2d2b42ba3ced1a9b68124804f7b73e50359a4ea2 (patch) | |
tree | 403a541f7476eeed4df2e9af7bf9037c36ae44b4 /src/com/android/launcher3/IconCache.java | |
parent | 9ec6d402fab5ec988a5c8cce10fb61df6acef31a (diff) | |
parent | 39b700fcc501a5c9b2fb83d4b754fb24d43d5c49 (diff) | |
download | android_packages_apps_Trebuchet-2d2b42ba3ced1a9b68124804f7b73e50359a4ea2.tar.gz android_packages_apps_Trebuchet-2d2b42ba3ced1a9b68124804f7b73e50359a4ea2.tar.bz2 android_packages_apps_Trebuchet-2d2b42ba3ced1a9b68124804f7b73e50359a4ea2.zip |
resolve merge conflicts of 39b700fcc5 to ub-launcher3-master.
Change-Id: I394258be0c75289cab2f5141c0fb765504527420
Diffstat (limited to 'src/com/android/launcher3/IconCache.java')
-rw-r--r-- | src/com/android/launcher3/IconCache.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java index 1cf31fd8b..f271601ee 100644 --- a/src/com/android/launcher3/IconCache.java +++ b/src/com/android/launcher3/IconCache.java @@ -789,7 +789,7 @@ public class IconCache { } private static final class IconDB extends SQLiteOpenHelper { - private final static int DB_VERSION = 7; + private final static int DB_VERSION = 8; private final static String TABLE_NAME = "icons"; private final static String COLUMN_ROWID = "rowid"; |