Christopher Tate 5b5c7f9917 am 8f4e49a8: (-s ours) Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0 ... * commit '8f4e49a8fe4f568b2be090768f3297655ecd6d34': DO NOT MERGE - Require device encryption password for adb backup/restore		2011-10-14 10:35:40 -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	Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0	2011-10-12 13:03:11 -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