| commit | 047d53672d4fcfe5d480a170b6b1518e89c4038d | [log] [tgz] |
|---|---|---|
| author | Jay Shrauner <shrauner@google.com> | Mon Jun 23 20:59:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 20:59:00 2014 +0000 |
| tree | bb1dc307c2e50e5df94e485cd50018c5c2ffe663 | |
| parent | 5b28547536dedcd58c67a0596fb4337389d2b8d8 [diff] | |
| parent | 2bf26299da8f594ea996354044e140cf49a00665 [diff] |
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':