Martijn Coenen 9f9418f22f am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0 ... * commit '202b38cb71d123e4ebc8741643e84fa455ecd002': Remove NfcFragment from activity when no longer sharing.		2011-10-14 13:00:45 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "Reduce the size of libhwui by 50%"	2011-10-12 13:50:11 -07:00
libs	Surface: fix a protected buffer test	2011-10-12 18:42:33 -07:00
opengl	don't log EGL errors due to unimplemented proprietary extensions	2011-10-05 19:15:32 -07:00
services/surfaceflinger	SurfaceFlinger: update orientation via transactions	2011-10-11 13:34:01 -07: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