OSDN Git Service

(root) / android-x86 / frameworks-av.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 60a5dfb 7baf789)
am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really...
authorJustin Ho <justinho@google.com>
Mon, 23 Jan 2012 23:13:50 +0000 (15:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 23 Jan 2012 23:13:50 +0000 (15:13 -0800)
commitb85a11467b3d46cb275fcc0d866619d36cda8662
tree6664d5fcb31273378375c3967e81b78b85a6eb29tree | snapshot
parent60a5dfbfdee07988834f75b618687cfc993948efcommit | diff
parent7baf7894bc2f1a62440f381eeb50143f210a5d61commit | diff
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)"
services/audioflinger/AudioFlinger.cpp diff1 | diff2 | blob | history
services/audioflinger/AudioFlinger.h diff1 | diff2 | blob | history
frameworks/av
About OSDN
Find Software
Develop Software
Help