Kenny Root a51b6fd6f8 resolved conflicts for merge of b2d0ee16 to master ...

Change-Id: I4483a6d0ccecfea4a1e66bb6eba80d13e8b9a3a4

2011-05-19 15:02:18 -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 b2d0ee16 to master

2011-05-19 15:02:18 -07:00

jni

resolved conflicts for merge of 05be6d6f to master

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

sensorservice

frameworks/base: remove LOCAL_PRELINK_MODULE

2011-03-14 14:25:59 -07:00

surfaceflinger

SurfaceFlinger: unfreeze windows for fixed size buffers.

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

tests/servicestests

Return NetworkStats bundle from NM service.

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