Jim Miller 23b2ef6864 am b4f0a9f3: Merge "Fix 5326463: rework sim state handling in lockscreen" into ics-factoryrom ... * commit 'b4f0a9f3894c1f039168ad672f4aa194999c7cdd': Fix 5326463: rework sim state handling in lockscreen		2011-09-26 20:40:59 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Revert "Transfer large bitmaps using ashmem. Bug: 5224703"	2011-09-25 14:30:21 -07:00
libs	Region cannot handle malformed Rects. Abort the Region op in that case.	2011-09-26 15:58:20 -07:00
opengl	fix EGL debugger	2011-09-19 14:44:37 -07:00
services/surfaceflinger	am 3780d380: Merge "SurfaceFlinger: fix the transform hint" into ics-factoryrom	2011-09-26 19:44:41 -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