tree 7dd8aadcffc35c98504f35d69fe467c0a8e8f397
parent 7edbacf24e60c01e2d3b10715ec8f9cc2f55c11a
parent ff4c64d6b1b58494a1b15f1a664e5c421d095d15
author Jean-Baptiste Queru <jbq@google.com> 1344627842 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344627842 -0700

am ff4c64d6: am c64a1787: Merge "Fix initialization of audio mixer track resources for MIPS."

* commit 'ff4c64d6b1b58494a1b15f1a664e5c421d095d15':
  Fix initialization of audio mixer track resources for MIPS.