Dianne Hackborn 6b592723c9 resolved conflicts for merge of f51ded0f to master ...

Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2

2011-06-10 12:45:36 -07:00

..

binder

Make sure binder ioctl structs don't contain uninitialized values.

2011-04-21 14:37:15 +04:00

camera

CameraParameters: add PIXEL_FORMAT_RGBA8888

2011-06-06 18:04:17 -07:00

diskusage

…

gui

9-axis sensor fusion with Kalman filter

2011-05-27 17:04:55 -07:00

hwui

Don't apply AA to rects with no rotation/perspective.

2011-06-09 18:52:38 -07:00

rs

More work to make libRS buildable on the host.

2011-06-03 10:18:01 -07:00

storage

…

surfaceflinger_client

merge libsurfaceflinger_client into libgui

2011-03-25 18:42:40 -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

usb

am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak

2011-04-11 14:24:11 -07:00

utils

resolved conflicts for merge of f51ded0f to master

2011-06-10 12:45:36 -07:00