OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f80dd2 a1d73d9)
am a1d73d9b: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 01:06:09 +0000 (18:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jun 2013 01:06:09 +0000 (18:06 -0700)
* commit 'a1d73d9be0beafd10642d6db0136b16353a32096':
  audioflinger: fix effects on direct output threads


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