Dianne Hackborn b18d467bbc resolved conflicts for merge of 54cb63e2 to master ... Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10		2011-06-02 16:44:52 -07:00
..
binder	Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)	2011-04-13 10:21:56 -07:00
gui	9-axis sensor fusion with Kalman filter	2011-05-27 17:04:55 -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	Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)	2011-05-25 14:37:17 -07:00
utils	resolved conflicts for merge of 54cb63e2 to master	2011-06-02 16:44:52 -07:00