resolve merge conflicts of 39b700fcc5 to ub-launcher3-master.

Change-Id: I394258be0c75289cab2f5141c0fb765504527420
This commit is contained in:
Sunny Goyal committed 2015-12-04 10:04:54 -08:00
commit 2d2b42ba3c
4 files changed
+261 -8

No files matched your search

+1 -1
View File
@@ -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";