| commit | 5d2795d583d1db408e4c1efb21931bf0a8299c85 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Sep 10 18:25:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 10 18:25:51 2015 +0000 |
| tree | c88810aaa4c3da63f37a05141e6780f056681bec | |
| parent | 061f7ae8ad39fac3956e70d34e9a3c5c0237fca8 [diff] | |
| parent | dac290d505f2b164956371c5a6353c8715b78251 [diff] |
am dac290d5: am 7e6de2f2: am c59abe4b: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev * commit 'dac290d505f2b164956371c5a6353c8715b78251': Revert "Fix AudioTrackTest.testGetTimestamp"