| commit | f6d44c47c14d155dd4cef76364b981fcd6edfe89 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Jul 28 17:49:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 28 17:49:28 2015 +0000 |
| tree | 75a06f0ba815a12f59c77cc1e18c227e5626be8c | |
| parent | 59c06496c25c4937830d3d1c283da0a9d2a7951c [diff] | |
| parent | 7f1ed1b12655ff7ad79e49d9092c6f653cd6a0c3 [diff] |
am 7f1ed1b1: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: aea6a23 -s ours automerge: c9dd710 * commit '7f1ed1b12655ff7ad79e49d9092c6f653cd6a0c3': Fix AudioTrackTest.testGetTimestamp