Jim Miller 46c8dbad85 am 5943c1dc: am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1 ... * commit '5943c1dc406574b360e9cb1343a5dab00a84a8e2': Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen		2011-11-10 16:15:14 +00:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am 88061d6b: am 5462bc63: Fix a leak in Parcel::writeBlob.	2011-11-07 15:51:31 +00:00
libs	Fix possible leak in Parcel::writeDupFileDescriptor.	2011-11-07 12:22:39 -08: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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00