Dianne Hackborn ed60f81940 resolved conflicts for merge of 76450622 to master ...

Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83

2011-06-02 09:20:52 -07:00

..

audioflinger

Use channel mask instead of channel count for track creation

2011-06-01 10:55:29 -07:00

camera

frameworks/base: android_native_buffer_t -> ANativeWindowBuffer

2011-05-03 16:40:14 -07:00

input

am 3f5b95b0: am a4e74744: am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2

2011-05-31 16:03:07 -07:00

java

resolved conflicts for merge of 76450622 to master

2011-06-02 09:20:52 -07:00

jni

UsbService: Refactor USB host and device support into two separate classes

2011-05-31 20:52:06 -04:00

sensorservice

9-axis sensor fusion with Kalman filter

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

surfaceflinger

Merge "Fix a race that could cause GL commands to be executed from the wrong thread."

2011-05-19 19:42:20 -07:00

tests/servicestests

Collect historical network stats.

2011-06-01 17:44:52 -07:00