commit | e45b24b60084196414a406a9f9c41608f0a2ca8e | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Sat Jul 25 04:58:43 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Jul 25 04:58:43 2015 +0000 |
tree | e15ecacf71fdc81d23b5d522cad7b50918474578 | |
parent | 23ba97556568749dd2329c6bb74b20a6166a0b48 [diff] | |
parent | f3dd5ae671d63ce5516b1ef7124f429dde3dc954 [diff] |
Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: 61f6182 -s ours automerge: f3dd5ae * commit 'f3dd5ae671d63ce5516b1ef7124f429dde3dc954': Fix AudioTrackTest.testGetTimestamp