| commit | 82b7035c48be5db1f1dd6dd9795e943e2a2abd25 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 21:04:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 21:04:35 2015 +0000 |
| tree | d4d4a0d2c3b83b1a2b958f971208bb87772c72b8 | |
| parent | 4645ebfa90cb57fe568233e9d63242a2d316cad7 [diff] | |
| parent | a82fbe57c3b6664ee255a255bb46408024467837 [diff] |
am a82fbe57: am d2afb56c: am e81288b5: am 5eaa51b2: am f2f3b301: am f9ed3357: am c0c712fb: am 13ccb595: am 99c8f777: am c9dd7108: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: aea6a23 -s ours * commit 'a82fbe57c3b6664ee255a255bb46408024467837':