tree 50f65eabb52b7f241baa88268178021bcff5a156
parent a8f06e4ad6b53d19e728d20da282a71d37e44232
parent 16b6cbc6eb4a074c2e3e4de740b990137f5940d8
author Andreas Huber <andih@google.com> 1363211295 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363211295 +0000

am f15c0d6d: Merge "Adds audio support to DirectRenderer." into jb-mr2-dev

* commit 'f15c0d6d0d80899da9c2d0c479aebc7f42464f27':
  Adds audio support to DirectRenderer.