Gilles Debunne 1b172b75cb Merge "Bug 5278473 & 5278471: delete option in suggestion popup menu"		2011-09-29 10:21:18 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Revert "Transfer large bitmaps using ashmem. Bug: 5224703"	2011-09-25 14:30:21 -07:00
libs	may fix the build	2011-09-28 17:33:11 -07:00
opengl	fix EGL debugger	2011-09-19 14:44:37 -07:00
services/surfaceflinger	Merge changes Ib302d79e,Ib4ee085f	2011-09-27 14:24:09 -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