| commit | 6bea5574fbd134a4f6e535eb35efabbe5f6735dd | [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 | a391a16652e856ed088baf870d69ccd2630df64f | |
| parent | dc22fa852d0dd478f5ef084c9b39c4f779db6e98 [diff] | |
| parent | 50b034725b9295f650d7807706c746f03158d247 [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