Dianne Hackborn 02d37b9731 resolved conflicts for merge of 892d11f4 to master ...

Change-Id: I21eca0002100d898e167a25aaa46d896deca2a11

2012-01-20 18:42:07 -08:00

..

audioflinger

Remove AudioFlinger dependencies on client

2012-01-20 17:12:59 -08:00

camera

am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"

2012-01-19 17:26:12 -08:00

input

am 5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1

2012-01-20 11:26:43 -08:00

java

resolved conflicts for merge of 892d11f4 to master

2012-01-20 18:42:07 -08:00

jni

Rename LOG_ASSERT to ALOG_ASSERT

2012-01-19 14:45:08 -08:00

powermanager

…

sensorservice

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

surfaceflinger

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

tests/servicestests

Restrict app data on metered networks.

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