| commit | b08e0fb01ec9ca322ff4d18ad9c543967b097d8a | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Sat Jul 25 04:58:34 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jul 25 04:58:34 2015 +0000 |
| tree | 6dd372de653710fead98ffaddce6baa38c8bb816 | |
| parent | b19860ce4ab5749eb88fbf343151aa7bf4bd5d2c [diff] | |
| parent | 47e02eb6f90741414b5b248cfec94b756a3a33b3 [diff] |
Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev automerge: c59abe4 -s ours automerge: 47e02eb * commit '47e02eb6f90741414b5b248cfec94b756a3a33b3': Revert "Fix AudioTrackTest.testGetTimestamp"