Jean-Michel Trivi 793a6a9a7a am 49f61439: (-s ours) Merge "DO NOT MERGE Fix 5389442 RemoteControlClient javadoc" into ics-mr0 ... * commit '49f61439db7f8960745b0a5664795b5a5ad31ef8': DO NOT MERGE Fix 5389442 RemoteControlClient javadoc		2011-10-12 09:42:48 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Use ashmem for CursorWindows.	2011-10-11 11:03:19 -07:00
libs	Use ashmem for CursorWindows.	2011-10-11 11:03:19 -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 an issue where the screen could stay off"	2011-10-10 22:21:57 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00