Uriel Rodriguez 97dfe72604 am d814d4fa: Merge "going directly to backup after face unlock fails 15 times" into ics-mr0 ... * commit 'd814d4fa0c76a0384f7e32816e1ca36f237911c6': going directly to backup after face unlock fails 15 times		2011-10-17 11:31:19 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am 57337eb7: Merge "Add a LayerScreenshot" into ics-mr0	2011-10-17 11:30:33 -07:00
libs	Merge "Deprecate local-only CursorWindows."	2011-10-14 21:05:58 -07:00
opengl	don't log EGL errors due to unimplemented proprietary extensions	2011-10-05 19:15:32 -07:00
services/surfaceflinger	Add a LayerScreenshot	2011-10-14 14:32:48 -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