| commit | 79d96602448025cd38bdb359815eec48b346a68b | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 03:52:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 03:52:46 2015 +0000 |
| tree | 4dd6a3f977920b63e51242482e3008dae33ff5a7 | |
| parent | e72c11ad36387d0372829427c20853b731139a5c [diff] | |
| parent | 41ea656ef3a7f04cf80b0bb1f5a59986c1b30bbd [diff] |
am 41ea656e: am 47e02eb6: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev automerge: c59abe4 -s ours * commit '41ea656ef3a7f04cf80b0bb1f5a59986c1b30bbd':