| commit | b32d99fe192d0b3513d53bf659fd6808acf37c17 | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Fri Jun 10 10:30:38 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 10 10:30:38 2011 -0700 |
| tree | 1f23f0228ebff77d081c706b7f81bec4741016ef | |
| parent | d5fee4df48a1a2d24219ef892230621396d9ab9d [diff] | |
| parent | 695d014c6feb0751132e999082ebcb7e089a3245 [diff] |
am e668c0b6: (-s ours) am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" * commit 'e668c0b69896996040f394e0a95f71dd4b9c6257': stagefright aacenc/amrwbenc: Convert line breaks to Unix style