OSDN Git Service

am 0056c739: Merge "Make sure our aac decoder handles this parameter."
authorAndreas Huber <andih@google.com>
Tue, 31 Jan 2012 16:33:20 +0000 (08:33 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 Jan 2012 16:33:20 +0000 (08:33 -0800)
commit5bfd49942fac4b315c899beb08675343f0f2235a
tree5ebdb017018c8cb23b5ff0034ce7f7a5a16bfb3f
parent6de1c0f99ef4f097b0155d72a10ac12f91bc4c8c
parent0056c739c5674f7f18d0c8dd2b13b42db97cec5a
am 0056c739: Merge "Make sure our aac decoder handles this parameter."

* commit '0056c739c5674f7f18d0c8dd2b13b42db97cec5a':
  Make sure our aac decoder handles this parameter.