tree 9b876c818a11d7d0c17a64ea535e408da2b326f6
parent 6716898477122009be579f9d509b16e7b506358b
parent 17e4046ab317d8583e3bc58cafc8df3924a430a0
author Daniel Xie <dxie@google.com> 1437429052 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1437429052 +0000

Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev