tree bb1dc307c2e50e5df94e485cd50018c5c2ffe663
parent 5b28547536dedcd58c67a0596fb4337389d2b8d8
parent 2bf26299da8f594ea996354044e140cf49a00665
author Jay Shrauner <shrauner@google.com> 1403557140 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403557140 +0000

am 2bf26299: (-s ours) am f89f55d9: am c736dbcf: (-s ours) am e4dbcf35: am cf4d2a64: am 38ae6989: (-s ours) am ce2b95ae: Fix AudioEngine to allow re-initialization - DO NOT MERGE

* commit '2bf26299da8f594ea996354044e140cf49a00665':