Jim Miller 8d7d5097bd Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1		2011-11-17 18:58:20 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1	2011-11-16 11:34:30 -08:00
libs	Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1	2011-11-17 17:10:47 -08:00
opengl	Merge "EGL: fix blob cache extension detection" into ics-mr1	2011-11-17 17:10:32 -08:00
services/surfaceflinger	remove hack that hardcoded the refresh rate	2011-11-16 00:08:08 -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