Jamie Gennis 3eb4987991 am 729f4808: Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev ... * commit '729f48082e2c7660e94830e52006f7af4efb747a': Revert "SurfaceTexture: inherit from ConsumerBase"		2012-08-20 14:35:21 -07:00
build	Dalvik heap size for a 10" xhdpi tablet.	2012-08-01 18:14:45 -07:00
cmds	add /d/sync to dumpstate	2012-08-08 15:32:02 -07:00
data/etc	Move com.nxp.mifare to frameworks/native.	2012-04-12 21:24:08 -07:00
include	Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev	2012-08-20 14:33:24 -07:00
libs	Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev	2012-08-20 14:33:24 -07:00
opengl	am 6e820eec: am 6f89ebde: Merge "EGL: do not use sparse files for shader"	2012-08-20 09:42:32 -07:00
services	Fix deadlock in SF.	2012-08-17 18:48:56 -07: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