OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e9c52da
c58295b
)
am 827a597d: Reconcile with ics-mr1-release
author
The Android Open Source Project
<initial-contribution@android.com>
Mon, 30 Jan 2012 21:38:52 +0000
(13:38 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 30 Jan 2012 21:38:52 +0000
(13:38 -0800)
* commit '
827a597df70a51c6cccad52fae2be2c469f58b77
':
Revert "Fix
5797764
: Increase lock screen's thread priority"
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
Trivial merge