Jamie Gennis b63de44c22 am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 ... * commit '6f1dd757cb158d17c76baeb170f7db2271802ef8': SurfaceMediaSource: use the vid enc usage bit		2011-11-29 17:26:32 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1	2011-11-29 17:25:09 -08:00
libs	Merge "don't report an error when disconnecting from an abandoned surfacetexture" into ics-mr1	2011-11-21 17:57:31 -08:00
opengl	Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1	2011-11-21 15:54:54 -08:00
services/surfaceflinger	temporarily hardcode Nexus S refresh rate	2011-11-23 14:51:09 -08: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