Jim Miller 8e540328fc Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1		2011-11-09 15:19:31 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am 5462bc63: Fix a leak in Parcel::writeBlob.	2011-11-05 02:35:57 +00:00
libs	am 5462bc63: Fix a leak in Parcel::writeBlob.	2011-11-05 02:35:57 +00:00
opengl	EGL: add deferred saving of the cache	2011-11-08 17:59:36 -08:00
services/surfaceflinger	Fix an issue where we could wait for a non-existing transaction	2011-11-07 21:58:03 -08: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