| commit | 017cf34c4f409989fc1cfbdc1ec132df53eb4710 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Thu Aug 27 05:20:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:20:40 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | 9d348047e90afc79747451a28f29eb9fdba00511 [diff] | |
| parent | 060abccce3b8f897d4c688336fa3d17dbe331c88 [diff] |
am 060abccc: (-s ours) am 3192cbda: am 5cc5fd61: Merge "AMR-NB encoder: Add test" * commit '060abccce3b8f897d4c688336fa3d17dbe331c88':