commit 1362ec74fc4f1dc223c9c322f8f49c966ba67594
author Michael Wright <michaelwr@google.com> Fri Aug 07 18:12:20 2015 +0100
committer Michael Wright <michaelwr@google.com> Fri Aug 07 18:12:20 2015 +0100
tree 17deec99b25f59a7832bcb2c57babf6c78750648
parent 50be1df76e2c84fc3c893ec3d3e51ba427dd3ee6
parent 62ec2dd563eb9f537d76e6bb9c13d630f5ab01dc

Merge commit '62ec2dd5' into mm

Change-Id: I34801df36735545fc500486209573ed2864a0430

include/android/keycodes.h

diff --git a/include/android/keycodes.h b/include/android/keycodes.h
index f671116..1f55d9f 100644
--- a/include/android/keycodes.h
+++ b/include/android/keycodes.h
@@ -731,7 +731,11 @@
     /** Generic stem key 2 for Wear */
     AKEYCODE_STEM_2 = 266,
     /** Generic stem key 3 for Wear */
-    AKEYCODE_STEM_3 = 267
+    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.