resolved conflicts for merge of db81dc7 to master

Change-Id: Ie7e1d9a255934e45d8b241b15e9674046cff2444

Author: adamp

core/java/android/view/ViewConfiguration.java

@@ -149,7 +149,7 @@ public class ViewConfiguration {
      * It may be appropriate to tweak this on a device-specific basis in an overlay based on
      * the characteristics of the touch panel and firmware.
      */
-    private static final int TOUCH_SLOP = 4;
+    private static final int TOUCH_SLOP = 8;
 
     /**
      * Distance the first touch can wander before we stop considering this event a double tap

core/res/res/values/config.xml

@@ -750,6 +750,6 @@
 
     <!-- Base "touch slop" value used by ViewConfiguration as a
          movement threshold where scrolling should begin. -->
-    <dimen name="config_viewConfigurationTouchSlop">4dp</dimen>
+    <dimen name="config_viewConfigurationTouchSlop">8dp</dimen>
 
 </resources>