Kenny Root 81bc567745 resolved conflicts for merge of 18490fb9 to master ... Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37		2011-04-12 12:51:08 -07:00
..
binder	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -08:00
gui	remove more unused references to ISurface	2011-04-05 20:11:55 -07:00
surfaceflinger_client	merge libsurfaceflinger_client into libgui	2011-03-25 18:42:40 -07:00
ui	Coalesce input events that arrive faster than 333Hz.	2011-04-07 13:11:16 -07:00
utils	resolved conflicts for merge of 18490fb9 to master	2011-04-12 12:51:08 -07:00