commit | c9dd71089275ed78878e52c99ccf84943130940d | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Fri Jul 24 20:23:59 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 24 20:23:59 2015 +0000 |
tree | 55072def75b911922bbc6a460c5ab0e3a3fd16ec | |
parent | 8c94827148cb1c09563a22947bcf92681b7688fa [diff] | |
parent | aea6a23f121777190e5c8fa0b9a34ca7b2197188 [diff] |
Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: aea6a23 -s ours * commit 'aea6a23f121777190e5c8fa0b9a34ca7b2197188': Fix AudioTrackTest.testGetTimestamp