OSDN Git Service

am d384a2c4: (-s ours) am 4f9e38c6: am 21e81bca: am e010f65e: audioflinger: Fix for...
authorHaynes Mathew George <hgeorge@codeaurora.org>
Wed, 5 Mar 2014 21:54:25 +0000 (21:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Mar 2014 21:54:25 +0000 (21:54 +0000)
* commit 'd384a2c44810ce1b51277cc4ab4c5415ff7de6ee':
  audioflinger: Fix for a deadlock in track creation


Trivial merge