| commit | 61aaedb278afed833d19a51eeda23fa61e71d9f9 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Thu Jul 17 12:30:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 17 12:30:39 2014 +0000 |
| tree | 56743760b6e6499da7f6fd2713add7c5d944cd4a | |
| parent | b240fe6de0e2e61bb97a2569e583148b11e2d1d3 [diff] | |
| parent | 488f2392a55e426f63966f118bfbf46c3f850f35 [diff] |
am 488f2392: Merge "getSampletime -> getSampleTime" * commit '488f2392a55e426f63966f118bfbf46c3f850f35': getSampletime -> getSampleTime