Eric Fischer 0777571e74 am 08d0f642: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 ... * commit '08d0f6420ac439265e9b4086c931173b44409c51': Import revised translations. DO NOT MERGE		2011-10-26 18:36:40 +00:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGE	2011-10-25 16:28:24 +01:00
libs	Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE	2011-10-26 09:57:54 +01: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