Dianne Hackborn 79ba9b5e39 resolved conflicts for merge of 06a8ceac to master ... Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69		2011-05-19 21:44:52 -07:00
..
binder	Make sure binder ioctl structs don't contain uninitialized values.	2011-04-21 14:37:15 +04:00
gui	Disable error report temporarily to enable inline video	2011-05-18 14:37:51 -07:00
surfaceflinger_client	merge libsurfaceflinger_client into libgui	2011-03-25 18:42:40 -07:00
ui	Add initial API for stylus and mouse buttons.	2011-05-13 12:11:17 -07:00
utils	resolved conflicts for merge of 06a8ceac to master	2011-05-19 21:44:52 -07:00