| commit | 8c6d777da0e96b9ed5f0e2c1e643e767b17cb9e1 | [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 | 2bbddd8f8c19058c8069b4704e48ad246925b6bf | |
| parent | 799b7f0c1a89644351c4306e7e83176b05d80916 [diff] | |
| parent | e668c0b69896996040f394e0a95f71dd4b9c6257 [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