| commit | bb6a25422cc037d2c372e864bb712dabc460fc61 | [log] [tgz] |
|---|---|---|
| author | Jay Shrauner <shrauner@google.com> | Wed Apr 30 12:17:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:17:26 2014 +0000 |
| tree | 733b9926c554ff76dd94bf79918fe68e469402e5 | |
| parent | 25e5dbe78295353bdbc574130c03db2d8b014452 [diff] | |
| parent | c8c2ad85474da63f5d70669b223f7a69f204956d [diff] |
am c8c2ad85: (-s ours) am bdd65f5e: (-s ours) am 38ae6989: am ce2b95ae: Fix AudioEngine to allow re-initialization - DO NOT MERGE * commit 'c8c2ad85474da63f5d70669b223f7a69f204956d':