commit d79079227fa9a9b06894120b1661808b643dae5c
author Andreas Huber <andih@google.com> Tue Jul 20 10:40:39 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 20 10:40:39 2010 -0700
tree 6003c16314885bf515785ba2648334434bff2762
parent 2b4aeed8d69f5f10dede9da5c38123ff9f78f942
parent 3c3ddfa39635a2d39f4ee7c966fb9403fe1ec9d8

am cc14a839: Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we\'ll still play it back correctly.

Merge commit 'cc14a8393b92cd1ed6cba74829396045605ab211' into gingerbread-plus-aosp

* commit 'cc14a8393b92cd1ed6cba74829396045605ab211':
  Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.