Jean-Baptiste Queru b420ff334a am eff6ed0f: Ignore e36657e5 ... * commit 'eff6ed0fee42e4324ceb8d5a20be09bb2f34aa9f': Do not merge. Fix a memory leak of a Binder in SpellCheckerService		2011-11-22 13:18:05 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	EGL: default to swap interval 1	2011-11-21 14:37:29 -08:00
libs	Merge "don't report an error when disconnecting from an abandoned surfacetexture" into ics-mr1	2011-11-21 17:57:31 -08:00
opengl	Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1	2011-11-21 15:54:54 -08:00
services/surfaceflinger	remove hack that hardcoded the refresh rate	2011-11-16 00:08:08 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00