Eric Fischer 84e37b25ca am f3ea0231: (-s ours) am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 ... * commit 'f3ea02319fc8d1f882ef7f392c245e197ab858de': Import revised translations. DO NOT MERGE		2011-12-12 15:39:23 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "GenerationCache::get would return a random value instead of NULL Bug #5401917"	2011-12-08 18:51:03 -08:00
libs	Improve the VSYNC api a bit.	2011-12-06 22:43:10 -08:00
opengl	Fix convert8To4, convert8To5	2011-12-09 14:06:07 -08:00
services/surfaceflinger	Improve the VSYNC api a bit.	2011-12-06 22:43:10 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00