Dianne Hackborn 3ae00fabc7 resolved conflicts for merge of bbca8133 to master ... Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6		2011-05-24 11:27:11 -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
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 bbca8133 to master	2011-05-24 11:27:11 -07:00