Marco Nelissen 0129f1a27f resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp ... Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643		2011-06-06 09:55:15 -07:00
..
binder	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -08:00
gui	SurfaceTexture: disallow unsupported uses.	2011-03-15 10:37:37 -07:00
surfaceflinger_client	ANativeWindow: add query for the concrete type.	2011-03-14 17:47:11 -07:00
ui	Implement pointer acceleration.	2011-06-02 14:12:05 -07:00
utils	resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp	2011-06-06 09:55:15 -07:00