tree 289102a0a5061a4bef45fdc5b83330e09ed8b870
parent a2fb8a7c2178f956861b6cba60326e72f7e1e57a
parent d3523f89a867afa111bb332887bf006ec3ae93e6
author Andreas Huber <andih@google.com> 1317406478 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317406478 -0700

am cb52d012: Merge "Gracefuly return on detecting wrong AAC format from corrupted files"

* commit 'cb52d012e910b86d3562d4cad32d66e17986e286':
  Gracefuly return on detecting wrong AAC format from corrupted files