| commit | b04016c89c858ba73cfe4124eb9fac687fc68c2a | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Aug 05 18:27:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 05 18:27:41 2015 +0000 |
| tree | 25379a99a4070684e6265bb241ca8309cf5dc444 | |
| parent | cd8204b4a5619663a63f909af3b6dab7ba0b01bc [diff] | |
| parent | cbe6ca3ec345309b253ae5800576b1b1d1bc865d [diff] |
am cbe6ca3e: am f6d44c47: am 7f1ed1b1: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: aea6a23 -s ours automerge: c9dd710 * commit 'cbe6ca3ec345309b253ae5800576b1b1d1bc865d': Fix AudioTrackTest.testGetTimestamp