| commit | ea8285bf471d94abef720327f606b54b7cf86848 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 21:04:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 21:04:45 2015 +0000 |
| tree | d4d4a0d2c3b83b1a2b958f971208bb87772c72b8 | |
| parent | 8dad3254040d8ae78bdac5286ed122af3299d85e [diff] | |
| parent | 5785d95600cee4aa23b66f93d5ea9dfa5efb5d48 [diff] |
am 5785d956: am ebe629b4: am 2a1943d0: am 4052f090: am 07f43bac: am d3135a77: am f3f1e77d: am 79d96602: am 41ea656e: am 47e02eb6: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev automerge: c59abe4 -s ours * commit '5785d95600cee4aa23b66f93d5ea9dfa5efb5d48':