Amith Yamasani 94eeada651 am 421648ed: (-s ours) Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0 ... * commit '421648ed06a2c944bc6a5fa866d461761533005b': Backup owner info as part of settings backup. DO NOT MERGE.		2011-10-12 10:00:54 -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