Fred Chung 684954cc00 am c2c77700: am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0 ... * commit 'c2c77700fbab25bc48002a46a6c0d8a81008030c': DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e		2011-11-17 14:53:45 -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	be a bit more defensive when parsing extension strings	2011-11-16 16:49:25 -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