Dianne Hackborn 161e67ff3b resolved conflicts for merge of 06a8ceac to master ...

Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69

2011-05-19 21:44:52 -07:00

..

audioflinger

Merge "Fix audio effect framework issues"

2011-05-13 10:24:24 -07:00

camera

frameworks/base: android_native_buffer_t -> ANativeWindowBuffer

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

input

am 0d9288d7: am 2bdb756c: am 4fb76253: Fix bounds check. Bug: 4413945

2011-05-13 15:22:35 -07:00

java

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -07:00

jni

resolved conflicts for merge of 05be6d6f to master

2011-05-09 19:00:59 -07:00

sensorservice

Fix a crasher in SensorService

2011-05-19 16:21:32 -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

Return NetworkStats bundle from NM service.

2011-05-04 16:07:21 -07:00