Scott Main 366ccb533e am 12f9900b: am 737c3dd9: Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0 ... * commit '12f9900bfb004a09ea6a8ce0df27c661124f46ac': docs: add package description for wifi.p2p and update the one for wifi		2011-10-27 15:55:22 +00:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "Rename SensorChannel to BitTube"	2011-10-26 12:51:44 -07:00
libs	Merge "Rename SensorChannel to BitTube"	2011-10-26 12:51:44 -07:00
opengl	don't log EGL errors due to unimplemented proprietary extensions	2011-10-05 19:15:32 -07:00
services/surfaceflinger	Merge "Fix software GL renderer."	2011-10-21 16:22:15 -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