| commit | c0c712fbd46e88f5a4a5495e55629383b378ec5c | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 16:48:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 16:48:21 2015 +0000 |
| tree | 8b99b9eca46ec6f323a078c648ad93f56bcc1851 | |
| parent | 201ba8778cd97e6a785405785d6359853af5fc9b [diff] | |
| parent | 13ccb595399f691bc7795995d83ab927a925413e [diff] |
am 13ccb595: am 99c8f777: am c9dd7108: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: aea6a23 -s ours * commit '13ccb595399f691bc7795995d83ab927a925413e':