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