tree 86733ff90d3c7da75f9ff79cecad783e80866f42
parent 004a77836d1963847acd20ea684e2ffe48aa3f19
parent 0a8358c171306cbe2f67339ee75eee80ab59a439
author James Dong <jdong@google.com> 1278701039 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1278701039 -0700

am a60337ce: am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread

Merge commit 'a60337ce578f91926a5e8ea30cb47740b994fc96'

* commit 'a60337ce578f91926a5e8ea30cb47740b994fc96':
  Enable the support for decoding audio with AAC+ and eAAC+ features