| commit | 7521344df2a5b0f05b4193902123ea5485dbf01e | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Thu Jun 09 12:14:11 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 09 12:14:11 2011 -0700 |
| tree | 2bec06355ab419e7a2a9dfee166cab7980866ea9 | |
| parent | ff86daf56a4a05b8a6a0b7d7d9e3bf968a5d2ccc [diff] | |
| parent | c66e2523b9c53c9870b0a17f663926fd9bcf5d46 [diff] |
am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" * commit 'd8b027b18f5a922ef729c6ee363eecb053358d47': stagefright aacenc/amrwbenc: Convert line breaks to Unix style