Dianne Hackborn 79ba9b5e39 resolved conflicts for merge of 06a8ceac to master ... Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69		2011-05-19 21:44:52 -07:00
..
binder	Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)	2011-04-13 10:21:56 -07:00
gui	fix onFrameAvailable	2011-05-11 18:01:51 -07:00
pim	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
private	remove last traces of copybit	2011-05-02 16:27:21 -07:00
surfaceflinger	frameworks/base: android_native_buffer_t -> ANativeWindowBuffer	2011-05-03 16:40:14 -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