James Dong 2b410fff34 Merge "Flush resets the count of played audio frames"		2011-09-28 13:46:49 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	SurfaceTexture: add name support	2011-09-22 17:49:10 -07:00
libs	Merge changes Ib302d79e,Ib4ee085f	2011-09-27 14:24:09 -07:00
opengl	fix EGL debugger	2011-09-19 14:44:37 -07:00
services/surfaceflinger	Merge changes Ib302d79e,Ib4ee085f	2011-09-27 14:24:09 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00