Scott Main 3032c5f44f am 47228cac: am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 ... * commit '47228cac900cd58d0687b6e6d980381cfc8010a1': docs: second set of diagram updates docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification		2012-01-05 12:09:07 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Add a new ui mode for "appliance"	2011-12-15 16:16:14 -08:00
libs	Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"	2012-01-05 07:38:29 -08:00
opengl	gltrace: add user settings to control data captured.	2012-01-04 12:50:13 -08:00
services/surfaceflinger	Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"	2012-01-05 07:38:29 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00