Justin Ho feb1d988c8 am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1 ...

* commit 'fee5a860a8355cda071ff23644e943414ba7f65d':
  DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"

2012-01-23 15:13:19 -08:00

..

audioflinger

am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1

2012-01-23 15:13:19 -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

Merge "Fix 5797764: Increase lock screen's thread priority" into ics-mr1

2012-01-20 15:24:20 -08:00

jni

Rename LOG_ASSERT to ALOG_ASSERT

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

powermanager

Fix issue 4604090: notification sound interrupted.

2011-07-25 18:41:12 -07:00

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

Cherry-picking Id45abeba and Ia065dec6 for MR1

2011-12-13 14:02:32 -08:00