| commit | d30e45bb94655574f2440d4ba69c448a0a9ddacd | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Thu Aug 27 20:33:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:33:14 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | 2ad929df7fb15544947e1aecfabb86a26d91c968 [diff] | |
| parent | 017cf34c4f409989fc1cfbdc1ec132df53eb4710 [diff] |
am 017cf34c: am 060abccc: (-s ours) am 3192cbda: am 5cc5fd61: Merge "AMR-NB encoder: Add test" * commit '017cf34c4f409989fc1cfbdc1ec132df53eb4710':