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

Change-Id: I20ad6eaace81786be080e28d6eb551908add6d90
This commit is contained in:
Tony Wickham committed 2016-10-12 14:38:43 -07:00
commit 6982de2485
18 files changed
+28 -24

No files matched your search

+2 -2
View File
@@ -204,7 +204,7 @@ public class FocusHelper {
return consume;
}
final Launcher launcher = (Launcher) v.getContext();
final Launcher launcher = Launcher.getLauncher(v.getContext());
final DeviceProfile profile = launcher.getDeviceProfile();
if (DEBUG) {
@@ -333,7 +333,7 @@ public class FocusHelper {
return consume;
}
Launcher launcher = (Launcher) v.getContext();
Launcher launcher = Launcher.getLauncher(v.getContext());
DeviceProfile profile = launcher.getDeviceProfile();
if (DEBUG) {