tree 35bb2147ea9f0ac25f588d4487559c25b7b30d8a
parent d629abd0976915be4aa4618d1617aa9df8fe27d2
parent 40d9f0105f0a8f484724619154b18c5d85589eff
author James Dong <jdong@google.com> 1277398211 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277398211 -0700

am 40d9f010: am 7fd22aab: Merge "Fixed the software AAC encoder" into gingerbread

Merge commit '40d9f0105f0a8f484724619154b18c5d85589eff'

* commit '40d9f0105f0a8f484724619154b18c5d85589eff':
  Fixed the software AAC encoder