| commit | f1300d31fe80c8e14cf2bbca6c7b6768110cd5ba | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Mar 20 19:23:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 19:23:13 2015 +0000 |
| tree | ec0f96c66e44c39e83800bb7a02792ab57781e99 | |
| parent | 76b54aa5240ee2052aabe7b671965a0836159fdb [diff] | |
| parent | cdf96ffa2693a1ae15d9b76cc24548764353d64f [diff] |
am cdf96ffa: Merge "ulaw and alaw aren\'t limited to 8kHz" * commit 'cdf96ffa2693a1ae15d9b76cc24548764353d64f': ulaw and alaw aren't limited to 8kHz