Dianne Hackborn aa9d84c37e resolved conflicts for merge of 05be6d6f to master ...

Change-Id: Ic6a6c5bb300f6f1d43f9ed550b284282b4f16212

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

..

audioflinger

audioflinger: don't do work in constructor, instead do it in onFirstRef

2011-04-27 16:20:22 -07:00

camera

frameworks/base: android_native_buffer_t -> ANativeWindowBuffer

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

input

resolved conflicts for merge of 05be6d6f to master

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

java

resolved conflicts for merge of 05be6d6f to master

2011-05-09 19:00:59 -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

Fix a race in SurfaceFlinger that could cause layers to be leaked forever.

2011-05-03 20:44:51 -07:00

tests/servicestests

Return NetworkStats bundle from NM service.

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