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
build	native: Restore VM memory overrides	2015-10-12 23:36:09 -07:00
cmds	Android 6.0.0 release 26	2015-11-05 01:41:42 +00:00
data/etc	Add XML for pro audio feature	2015-08-27 20:09:39 -07:00
docs	framework/native/docs: remove doc footer for jd output	2015-05-27 10:13:35 -07:00
include	Android 6.0.0 release 26	2015-11-05 01:41:42 +00:00
libs	Android 6.0.0 release 26	2015-11-05 01:41:42 +00:00
opengl	libEGL: allow devices to workaround Google bug 10194508	2015-10-16 14:45:10 -07:00
services	Android 6.0.0 release 26	2015-11-05 01:41:42 +00:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00