Dianne Hackborn b7afe325b4 Merge "Fix issue #5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1		2011-11-11 11:36:14 -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	Merge "Terminate EGL when an app goes in the background" into ics-mr1	2011-11-10 17:10:41 -08:00
services/surfaceflinger	Back to 59fps	2011-11-09 17:54:37 -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