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
..
android	Android 6.0.0 release 26	2015-11-05 01:41:42 +00:00
batteryservice	Android 6.0.0 release 26	2015-11-05 01:41:42 +00:00
binder	update app ops	2015-11-02 11:51:17 -08:00
diskusage	More changes to fix PDK build:	2012-10-24 12:30:41 -07:00
gui	Android 6.0.0 release 26	2015-11-05 01:41:42 +00:00
input	Android 6.0.0 release 26	2015-11-05 01:41:42 +00:00
media	omx: fix structure sizes to be the same on 32 and 64-bit builds	2015-07-21 00:19:04 +00:00
powermanager	Make IPowerManager native conform to .aidl for oneway	2014-09-05 17:12:24 -07:00
private	libgui/SF: Propagate SECURE Layer flag changes	2015-06-18 15:11:20 -07:00
ui	Android 6.0.0 release 26	2015-11-05 01:41:42 +00:00