am 827a597d: Reconcile with ics-mr1-release

Browse Source

* commit '827a597df70a51c6cccad52fae2be2c469f58b77':
  Revert "Fix 5797764: Increase lock screen's thread priority"
  DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"

...

This commit is contained in:

The Android Open Source Project 2012-01-30 13:38:52 -08:00 committed by Android Git Automerger

parent 5cfb7bcdb3 de973467d4

commit 81523a063c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available