| commit | e668c0b69896996040f394e0a95f71dd4b9c6257 | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Thu Jun 09 12:21:05 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 09 12:21:05 2011 -0700 |
| tree | e91b6adecdf3de0a09c7b73e48a49797babb3edb | |
| parent | 6a91953cc9bb8a48d867cc53e3cf5286d9a2f5ac [diff] | |
| parent | 644f36eab4eb9911ad897c9caae68b9c5a72388f [diff] |
am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" * commit '644f36eab4eb9911ad897c9caae68b9c5a72388f': stagefright aacenc/amrwbenc: Convert line breaks to Unix style