| commit | 3e674f4c7eab5d00b88330a94ae7ebbe23df155d | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Aug 06 05:10:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 06 05:10:59 2015 +0000 |
| tree | 054d0ed68f64cf1e8940951138b2a53ac8062df2 | |
| parent | 6550effc40de7303803f46ffe9db69b40b8f7b35 [diff] | |
| parent | b04016c89c858ba73cfe4124eb9fac687fc68c2a [diff] |
am b04016c8: am cbe6ca3e: am f6d44c47: am 7f1ed1b1: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: aea6a23 -s ours automerge: c9dd710 * commit 'b04016c89c858ba73cfe4124eb9fac687fc68c2a': Fix AudioTrackTest.testGetTimestamp