Christopher Tate ce0b8661b7 Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0		2011-10-14 10:33:13 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0	2011-10-12 13:03: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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00