Justin Ho fafa5f0042 am 218148f1: Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom ... * commit '218148f1ffb574282bdc72a1a4cc97b7129cf043': Revert "Adding selected state for scrubber control"		2011-09-16 14:49:17 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	A new API "androidGetThreadPriority"	2011-09-16 09:33:22 -07:00
libs	Merge "cleanup: fix typos in logs"	2011-09-16 12:58:30 -07:00
opengl	cleanup: fix typos in logs	2011-09-16 11:56:40 -07:00
services/surfaceflinger	SurfaceFlinger: fix isOpaque check in lockPageFlip	2011-09-14 18:23:37 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00