OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1de5c06 c7753b1)
am c7753b12: am abab1c33: AudioMixer: Remove tracks from enabledTracks after reseting...
authorGaurav Kumar <gaurav.kumar@broadcom.com>
Wed, 5 Mar 2014 23:50:55 +0000 (23:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Mar 2014 23:50:55 +0000 (23:50 +0000)
* commit 'c7753b12a9c8c1cba69ba75bccc0083c37bc67f1':
  AudioMixer: Remove tracks from enabledTracks after reseting outTemp


Trivial merge
frameworks/av
About OSDN
Find Software
Develop Software
Help