Jim Miller edc350504e Merge "resolved conflicts for merge of 1a783be3 to master"		2011-11-18 14:44:50 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am 7765fc65: am fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1	2011-11-17 05:46:00 -08:00
libs	am 9da22d2c: am 2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1	2011-11-18 02:37:41 -08:00
opengl	Merge "EGL: fix blob cache extension detection" into ics-mr1	2011-11-17 17:10:32 -08:00
services/surfaceflinger	remove hack that hardcoded the refresh rate	2011-11-16 00:08:08 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00