tree 75bbec756f6a14bdcbd0d8100a2af5ca25d95074
parent 1e5b2b3361ddd07259bf4b29820ca4aa5f3a861b
parent 5ca15ccf7336d5aa5a7b563742757fa37092eb48
author The Android Open Source Project <initial-contribution@android.com> 1340378305 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340378305 -0700

am 5ca15ccf: Reconcile with jb-release

* commit '5ca15ccf7336d5aa5a7b563742757fa37092eb48':
  Revert input buffer count for the SoftAAC* decoders back to 4.