Eric Laurent 3562931af9 resolved conflicts for merge of 05683c85 to master ...

Change-Id: I7846b7da8c5813b7a9b1f3f71aede0229689ff0d

2012-01-19 10:00:02 -08:00

..

audioflinger

resolved conflicts for merge of 05683c85 to master

2012-01-19 10:00:02 -08:00

camera

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

input

Fix a few memory leaks in the input dispatcher.

2012-01-12 18:30:12 -08:00

java

Fix edge cases leading to backup hanging forever

2012-01-18 15:44:47 -08:00

jni

Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE

2012-01-09 21:36:22 +00:00

powermanager

…

sensorservice

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

surfaceflinger

Get AID_GRAPHICS from right place

2012-01-13 13:45:39 -08:00

tests/servicestests

Restrict app data on metered networks.

2011-12-15 14:30:04 -08:00