resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

b/22609402
Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b

src/com/android/launcher3/CustomAppWidget.java

@@ -0,0 +1,14 @@
+package com.android.launcher3;
+
+public interface CustomAppWidget {
+    public String getLabel();
+    public int getPreviewImage();
+    public int getIcon();
+    public int getWidgetLayout();
+
+    public int getSpanX();
+    public int getSpanY();
+    public int getMinSpanX();
+    public int getMinSpanY();
+    public int getResizeMode();
+}