| commit | 3b9594a1f2a3f996343e0c02ea64575d2d931cd3 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:22:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:22:08 2015 +0000 |
| tree | 98509ed57ed5de37df6e0e64ba266e75c156c743 | |
| parent | 739ec4bd7c14690197640334daf8ab11fc003ec8 [diff] | |
| parent | 9e30a9cc30ab9ac9818f5e4aae1b9fb752747538 [diff] |
am 9e30a9cc: am b8d8ab53: am 4c4c2359: am af323b36: am 1ce4e788: am f3dd5ae6: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: 61f6182 -s ours * commit '9e30a9cc30ab9ac9818f5e4aae1b9fb752747538':