| commit | f3f1e77d434d3ef6335c3c025def3ac9a3305392 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 16:48:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 16:48:30 2015 +0000 |
| tree | 8b99b9eca46ec6f323a078c648ad93f56bcc1851 | |
| parent | a403e7b6d6565f2f81f922f261ac657900ffa802 [diff] | |
| parent | 79d96602448025cd38bdb359815eec48b346a68b [diff] |
am 79d96602: am 41ea656e: am 47e02eb6: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev automerge: c59abe4 -s ours * commit '79d96602448025cd38bdb359815eec48b346a68b':