| commit | 4c4c2359e8d753fbfefbbd1d508f962e835e7156 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 16:48:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 16:48:37 2015 +0000 |
| tree | 8b99b9eca46ec6f323a078c648ad93f56bcc1851 | |
| parent | 73f22c6438fde7caa4f0bf9e1590df02d2c865ca [diff] | |
| parent | af323b3613c297a629fa6fce7c49508bc1a8154b [diff] |
am af323b36: am 1ce4e788: am f3dd5ae6: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: 61f6182 -s ours * commit 'af323b3613c297a629fa6fce7c49508bc1a8154b':