tree e78d657c9e6791faec3c6c98ab459cb13888ce8a
parent 46d0b7d2b216e2acebd60f0c65d98f6880307c9c
parent f89f55d9dcf65cd655922bc9b64a05fbbafc4626
author Jay Shrauner <shrauner@google.com> 1403556331 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403556331 +0000

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 'f89f55d9dcf65cd655922bc9b64a05fbbafc4626':