Andreas Huber 52395b1e29 am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1 ... * commit '2c2ed7bef931f43dc0701ab723beb0cbed2cb630': Fixes a typo in AVIExtractor that would advertise the wrong video dimensions		2011-12-01 10:20:09 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge changes I7e973a35,Ib3386fcc into ics-mr1	2011-11-29 17:46:35 -08:00
libs	SurfaceTexture: add EGL_KHR_fence_sync option	2011-11-29 17:09:01 -08:00
opengl	add a way to access the version string of the h/w implementation of EGL	2011-11-29 18:00:35 -08:00
services/surfaceflinger	Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1	2011-11-30 13:52:21 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00