resolve merge conflicts of 2fd0208 to ub-launcher3-master

Change-Id: I20ad6eaace81786be080e28d6eb551908add6d90

src/com/android/launcher3/AnotherWindowDropTarget.java

@@ -27,7 +27,7 @@ import android.graphics.Rect;
 public class AnotherWindowDropTarget implements DropTarget {
     final Launcher mLauncher;
 
-    public AnotherWindowDropTarget (Context context) { mLauncher = (Launcher) context; }
+    public AnotherWindowDropTarget (Context context) { mLauncher = Launcher.getLauncher(context); }
 
     @Override
     public boolean isDropEnabled() { return true; }