Ricardo Cerqueira 1cdd1b5ad2 Android 6.0.0 release 26 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlYxAgIACgkQ6K0/gZqxDnjCqACfbBT6VOiUFQvRn7w1SAa+4rjF 1IwAn2rBUqWo0dOKVwF1DDfFmGZXc8SB =1BqV -----END PGP SIGNATURE----- Merge tag 'android-6.0.0_r26' into HEAD Android 6.0.0 release 26 Conflicts: include/android/input.h Change-Id: Ifa374c6d3055be3b8a5d60967f8b4c0043da739b		2015-11-05 01:41:42 +00:00
..
IInputFlinger.h	Move inputflinger process to host directory	2015-02-23 16:04:57 -08:00
Input.h	Add method to set action button on MotionEvent	2015-06-17 21:06:54 +01:00
InputDevice.h	Pass through availability of audio mic for input devices.	2015-04-09 10:02:16 -07:00
InputEventLabels.h	Android 6.0.0 release 26	2015-11-05 01:41:42 +00:00
InputTransport.h	Fix input tests to work with new MotionEvent member	2015-05-14 16:29:13 +01:00
KeyCharacterMap.h	Move input library code from frameworks/base.	2013-07-01 20:11:26 -07:00
KeyLayoutMap.h	Parse LED mappings in keylayout files. DO NOT MERGE	2014-03-03 13:59:35 -08:00
Keyboard.h	Move key attribute information out of native.	2014-04-22 16:55:36 -07:00
VelocityControl.h	Move input library code from frameworks/base.	2013-07-01 20:11:26 -07:00
VelocityTracker.h	Move input library code from frameworks/base.	2013-07-01 20:11:26 -07:00
VirtualKeyMap.h	Move input library code from frameworks/base.	2013-07-01 20:11:26 -07:00