diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:41:42 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:41:42 +0000 |
| commit | 1cdd1b5ad204cb319174f86b522fcb0dc7968ed6 (patch) | |
| tree | 208c78f58721f44168992cf88ae8d2b821f090de /include/input | |
| parent | 5e78568dab3b1bbddd1cbc0dd2004d9c2ddbdfeb (diff) | |
| parent | 3492a21877f93b2240dc823392b7e8adb2e1809e (diff) | |
| download | frameworks_native-1cdd1b5ad204cb319174f86b522fcb0dc7968ed6.zip frameworks_native-1cdd1b5ad204cb319174f86b522fcb0dc7968ed6.tar.gz frameworks_native-1cdd1b5ad204cb319174f86b522fcb0dc7968ed6.tar.bz2 | |
Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
Conflicts:
include/android/input.h
Change-Id: Ifa374c6d3055be3b8a5d60967f8b4c0043da739b
Diffstat (limited to 'include/input')
| -rw-r--r-- | include/input/InputEventLabels.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/input/InputEventLabels.h b/include/input/InputEventLabels.h index 89bb2f7..c2ed503 100644 --- a/include/input/InputEventLabels.h +++ b/include/input/InputEventLabels.h @@ -303,10 +303,6 @@ static const InputEventLabel KEYCODES[] = { DEFINE_KEYCODE(NAVIGATE_NEXT), DEFINE_KEYCODE(NAVIGATE_IN), DEFINE_KEYCODE(NAVIGATE_OUT), - DEFINE_KEYCODE(MEDIA_SKIP_FORWARD), - DEFINE_KEYCODE(MEDIA_SKIP_BACKWARD), - DEFINE_KEYCODE(MEDIA_STEP_FORWARD), - DEFINE_KEYCODE(MEDIA_STEP_BACKWARD), { NULL, 0 } }; |