Merge commit '62ec2dd5' into mm

Change-Id: I34801df36735545fc500486209573ed2864a0430

diff --cc include/android/keycodes.h
index f671116,de9e735..1f55d9f
--- 1/include/android/keycodes.h
--- 2/include/android/keycodes.h
+++ b/include/android/keycodes.h
@@@ -723,15 -307,10 +723,19 @@@ enum 
      AKEYCODE_NAVIGATE_NEXT   = 261,
      AKEYCODE_NAVIGATE_IN     = 262,
      AKEYCODE_NAVIGATE_OUT    = 263,
-     AKEYCODE_STEM_3 = 267
 +    /** Primary stem key for Wear
 +     * Main power/reset button on watch. */
 +    AKEYCODE_STEM_PRIMARY = 264,
 +    /** Generic stem key 1 for Wear */
 +    AKEYCODE_STEM_1 = 265,
 +    /** Generic stem key 2 for Wear */
 +    AKEYCODE_STEM_2 = 266,
 +    /** Generic stem key 3 for Wear */
++    AKEYCODE_STEM_3 = 267,
+     AKEYCODE_MEDIA_SKIP_FORWARD = 272,
+     AKEYCODE_MEDIA_SKIP_BACKWARD = 273,
+     AKEYCODE_MEDIA_STEP_FORWARD = 274,
+     AKEYCODE_MEDIA_STEP_BACKWARD = 275
  
      // NOTE: If you add a new keycode here you must also add it to several other files.
      //       Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.

diff --cc include/input/InputEventLabels.h
index a38de00,a7a9329..344f2f3
--- 1/include/input/InputEventLabels.h
--- 2/include/input/InputEventLabels.h
+++ b/include/input/InputEventLabels.h
@@@ -303,10 -303,10 +303,14 @@@ static const InputEventLabel KEYCODES[
      DEFINE_KEYCODE(NAVIGATE_NEXT),
      DEFINE_KEYCODE(NAVIGATE_IN),
      DEFINE_KEYCODE(NAVIGATE_OUT),
 +    DEFINE_KEYCODE(STEM_PRIMARY),
 +    DEFINE_KEYCODE(STEM_1),
 +    DEFINE_KEYCODE(STEM_2),
 +    DEFINE_KEYCODE(STEM_3),
+     DEFINE_KEYCODE(MEDIA_SKIP_FORWARD),
+     DEFINE_KEYCODE(MEDIA_SKIP_BACKWARD),
+     DEFINE_KEYCODE(MEDIA_STEP_FORWARD),
+     DEFINE_KEYCODE(MEDIA_STEP_BACKWARD),
  
      { NULL, 0 }
  };