tree 7d0f7ca035d28794849b31df6f339e41ce6bee2c
parent 808a411945246f0d15e2392549919bb6b4df51c3
parent f65d7c0669570f43f39988d8fd35ce4bb8fcf5a2
author James Dong <jdong@google.com> 1285089850 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285089850 -0700

am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread

Merge commit 'e5206694174d2140e662832425665ec3890fcc73' into gingerbread-plus-aosp

* commit 'e5206694174d2140e662832425665ec3890fcc73':
  Another attempt for fixing AAC+/eAAC+ related issue