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

b/22609402
Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
This commit is contained in:
Hyunyoung Song authored and Ed Heyl committed 2015-07-22 11:31:04 -07:00
1 parent a83129f0bc
commit e612775922
630 files changed
+23760 -21646

No files matched your search

+1 -1
View File
@@ -22,9 +22,9 @@ import com.android.launcher3.DropTarget.DragObject;
/**
* Interface defining an object that can originate a drag.
*
*/
public interface DragSource {
/**
* @return whether items dragged from this source supports
*/