| commit | 07f43bacc8c0b29ea6caa74cfe0970e0985d6874 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:10:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:10:08 2015 +0000 |
| tree | bf19a51d1801940acf2bed892bd776e56ed14fed | |
| parent | 7be08fbd11c1fd53ffdabcb324c0c269104b3c08 [diff] | |
| parent | d3135a771ffec92a0157f5078a1b18ba0b2b3638 [diff] |
am d3135a77: am f3f1e77d: am 79d96602: am 41ea656e: am 47e02eb6: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev automerge: c59abe4 -s ours * commit 'd3135a771ffec92a0157f5078a1b18ba0b2b3638':