| commit | ebe629b44d8a105fe579cc50f446ab2d31b0cfc4 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:41:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:41:39 2015 +0000 |
| tree | 0fe003ba0d24a69430cffa048f11766abc81bc61 | |
| parent | 693c418d4cf2f2d9ca2f3c14b1b3ebe270b8921e [diff] | |
| parent | 2a1943d0398036de13edcb2276b8e39775bc9968 [diff] |
am 2a1943d0: am 4052f090: am 07f43bac: am d3135a77: am f3f1e77d: am 79d96602: am 41ea656e: am 47e02eb6: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev automerge: c59abe4 -s ours * commit '2a1943d0398036de13edcb2276b8e39775bc9968':