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
..
DisplaySurface.h	Enable clang for libui/libgui/surfaceflinger	2014-12-04 17:56:17 -08:00
FloatRect.h	fix SF buffer cropping	2013-07-10 15:08:29 -07:00
FramebufferSurface.cpp	DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem	2015-03-19 13:59:12 -07:00
FramebufferSurface.h	am 5588d900: Merge "Enable clang for libui/libgui/surfaceflinger"	2014-12-05 18:01:48 +00:00
HWComposer.cpp	Android 6.0.0 release 26	2015-11-05 01:41:42 +00:00
HWComposer.h	Android 6.0.0 release 26	2015-11-05 01:41:42 +00:00
PowerHAL.cpp	SurfaceFlinger: send VSYNC power hints to IPowerManager	2014-06-18 18:51:24 -07:00
PowerHAL.h	SurfaceFlinger: send VSYNC power hints to IPowerManager	2014-06-18 18:51:24 -07:00
VirtualDisplaySurface.cpp	SurfaceFlinger: Add support for DisplayUtils	2015-10-06 03:22:25 -06:00
VirtualDisplaySurface.h	surfaceflinger: Clean up use of QC extended API	2015-10-12 23:36:09 -07:00