| commit | f89f55d9dcf65cd655922bc9b64a05fbbafc4626 | [log] [tgz] |
|---|---|---|
| author | Jay Shrauner <shrauner@google.com> | Fri Mar 07 02:55:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 02:55:30 2014 +0000 |
| tree | 262fff18e9eb30c7f99098b8bbb0c7106888eab5 | |
| parent | c5da8557f1a26e984b14b9eb64cda2d3d3ba71ce [diff] | |
| parent | c736dbcfc6c33f22bcea990ad38cc2ca0bd5e316 [diff] |
am c736dbcf: (-s ours) am e4dbcf35: am cf4d2a64: am 38ae6989: (-s ours) am ce2b95ae: Fix AudioEngine to allow re-initialization - DO NOT MERGE * commit 'c736dbcfc6c33f22bcea990ad38cc2ca0bd5e316': Fix AudioEngine to allow re-initialization - DO NOT MERGE