Files
lawnchair/src/com/android/launcher3/InfoDropTarget.java
Tony Wickham a2d1540c0e resolve merge conflicts of 82eb1f0ea to ub-launcher3-dorval-polish
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic1f6ace04ec2c11206276df76ef7a20df545d604
2017-05-03 12:59:09 -07:00

4.7 KiB