Dianne Hackborn b8678d76c3 resolved conflicts for merge of 210c1a26 to master ...

Change-Id: Ic44193e62215086c22225f2def5eee3159d26ae8

2012-02-23 10:54:06 -08:00

..

audioflinger

Merge "Avoid wp<>::unsafe_get() with a few exceptions"

2012-02-22 13:22:13 -08:00

camera

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

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

common_time

New clock sync control loop.

2012-02-17 09:46:37 -08:00

input

frameworks/base refactoring

2012-02-20 22:38:43 -08:00

java

resolved conflicts for merge of 210c1a26 to master

2012-02-23 10:54:06 -08:00

jni

frameworks/base refactoring

2012-02-20 22:38:43 -08:00

powermanager

…

sensorservice

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

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

surfaceflinger

Merge "createSurface getpid() first parameter was removed"

2012-02-21 07:24:16 -08:00

tests/servicestests

Unify shorthand for byte-based units.

2012-02-03 14:50:13 -08:00