Jesse Hall c41cddb897 Merge "surfaceflinger: fix -Wmismatched-tags warnings"		2014-09-06 20:14:27 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 8c1642ad: Merge "Remove obsolete prunedexcache"	2014-08-29 11:39:54 +00:00
data/etc	Add android.software.live_tv feature	2014-08-28 12:54:17 -07:00
include	Merge "surfaceflinger: fix -Wmismatched-tags warnings"	2014-09-06 20:14:27 +00:00
libs	GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT	2014-09-04 10:07:28 -07:00
opengl	am 4c5b9acf: Merge "Don\'t try to capture the pointer when using PBOs for texture APIs" into lmp-dev	2014-08-20 16:32:37 +00:00
services	Merge "surfaceflinger: fix -Wmismatched-tags warnings"	2014-09-06 20:14:27 +00:00
MODULE_LICENSE_APACHE2	…
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00