Eric Fischer 37363f858a am 72b7a7d9: (-s ours) am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread ... * commit '72b7a7d90b631a703681751c02f1447e3c75ccb0': Import revised translations. DO NOT MERGE		2011-08-01 11:23:08 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "Move extract native libraries to JNI code"	2011-07-27 15:54:51 -07:00
libs	Merge "Fix uses of all-subdir-makefiles"	2011-07-27 18:29:26 -07:00
opengl	Add new OpenGL test	2011-07-19 17:20:35 -07:00
services/surfaceflinger	SurfaceFlinger: fix a layer occlusion bug	2011-07-28 16:03:28 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00