Dianne Hackborn 66168d4bb4 resolved conflicts for merge of f51ded0f to master ... Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2		2011-06-10 12:45:36 -07:00
..
binder
gui	9-axis sensor fusion with Kalman filter	2011-05-27 17:04:55 -07:00
pim
private
surfaceflinger	frameworks/base: android_native_buffer_t -> ANativeWindowBuffer	2011-05-03 16:40:14 -07:00
ui	am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2	2011-06-07 17:52:30 -07:00
utils	resolved conflicts for merge of f51ded0f to master	2011-06-10 12:45:36 -07:00