OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4094d00 b15450e)
am 549629d3: Merge "Make sure stagefright -o terminates even if we\'re using a raw...
authorAndreas Huber <andih@google.com>
Thu, 16 Sep 2010 23:02:25 +0000 (16:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Sep 2010 23:02:25 +0000 (16:02 -0700)
Merge commit '549629d36690ac09498d0a9b2aac4ae4ceb7eead' into gingerbread-plus-aosp

* commit '549629d36690ac09498d0a9b2aac4ae4ceb7eead':
  Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)


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