Dianne Hackborn 36f80f3a5a resolved conflicts for merge of 590ec479 to master ...

Change-Id: I30503da6a73b9cb15eee66a67c75d50ccdc4b9f0

2011-05-31 23:11:16 -07:00

..

audioflinger

Removed interface to load audio effects libraries

2011-05-27 17:51:52 -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 590ec479 to master

2011-05-31 23:11:16 -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

Accessibility serviceconfiguration via meta-data

2011-05-31 12:04:18 -07:00