David Brown 6ebf5e1f4a Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1		2011-11-17 16:31:10 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1	2011-11-16 11:34:30 -08:00
libs	Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1	2011-11-16 16:13:38 -08:00
opengl	Merge "GLES: add image external enums" into ics-mr1	2011-11-17 15:47:28 -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