| commit | 5b380319f74d379b154c5ee96acf4ae4eba57fe3 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Mon Sep 21 21:30:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:30:52 2015 +0000 |
| tree | 634468126610e0bb5c6864877a04439e3bee99c0 | |
| parent | 761691a738dc858ec9b96e140481b751aad60722 [diff] | |
| parent | f7b647cc48f5d9fb9f898c14b70e484094a0cef3 [diff] |
am f7b647cc: (-s ours) am c755df5b: am 67a9edde: am d5833ca8: am dffe4621: Merge "DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""" into lmp-dev * commit 'f7b647cc48f5d9fb9f898c14b70e484094a0cef3': DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""