| commit | 9e30a9cc30ab9ac9818f5e4aae1b9fb752747538 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:10:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:10:12 2015 +0000 |
| tree | bf19a51d1801940acf2bed892bd776e56ed14fed | |
| parent | 1e22ed85f032984d5023874d273195c1592c146a [diff] | |
| parent | b8d8ab5364d224f8eef8c57da3792c1fa397d9b7 [diff] |
am b8d8ab53: am 4c4c2359: am af323b36: am 1ce4e788: am f3dd5ae6: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: 61f6182 -s ours * commit 'b8d8ab5364d224f8eef8c57da3792c1fa397d9b7':