The Android Automerger c6ce130bdf merge in ics-factoryrom-release history after reset to ics-factoryrom		2011-09-26 16:17:09 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Velocity Tracker II: The Revenge of Velocity Tracker	2011-09-14 19:16:37 -07:00
libs	Can't stop the fling!	2011-09-16 21:43:58 -07:00
opengl	Add (support for) EGL_NV_system_time extension.	2011-09-13 16:44:22 -07:00
services/surfaceflinger	Merge "(DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip" into ics-factoryrom	2011-09-26 15:44:41 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00