am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+...
am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread
Merge commit '6bb14e08' into gingerbread-plus-aosp
* commit '6bb14e08':
Enable the support for decoding audio with AAC+ and eAAC+ features