resolved conflicts for merge of b3f66877 to jb-mr2-dev-plus-aosp

Change-Id: I4e3c1e1c5613284c60afc9ce6639624abe08df0d

diff --cc cmds/input/src/com/android/commands/input/Input.java
index e43501c,6dc9f3d..80ac539
--- 1/cmds/input/src/com/android/commands/input/Input.java
--- 2/cmds/input/src/com/android/commands/input/Input.java
+++ b/cmds/input/src/com/android/commands/input/Input.java
@@@ -249,10 -237,9 +251,10 @@@ public class Input 
      private void showUsage() {
          System.err.println("usage: input ...");
          System.err.println("       input text <string>");
-         System.err.println("       input keyevent <key code number or name>");
+         System.err.println("       input keyevent <key code number or name> ...");
 -        System.err.println("       input [touchscreen|touchpad] tap <x> <y>");
 -        System.err.println("       input [touchscreen|touchpad] swipe <x1> <y1> <x2> <y2>");
 +        System.err.println("       input [touchscreen|touchpad|touchnavigation] tap <x> <y>");
 +        System.err.println("       input [touchscreen|touchpad|touchnavigation] swipe "
 +                + "<x1> <y1> <x2> <y2> [duration(ms)]");
          System.err.println("       input trackball press");
          System.err.println("       input trackball roll <dx> <dy>");
      }