| commit | 644f36eab4eb9911ad897c9caae68b9c5a72388f | [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 | 6b8184ca3cef4b9304c1db5f7d09b8d1fc077b96 | |
| parent | 90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f [diff] | |
| parent | d8b027b18f5a922ef729c6ee363eecb053358d47 [diff] |
am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" * commit 'd8b027b18f5a922ef729c6ee363eecb053358d47': stagefright aacenc/amrwbenc: Convert line breaks to Unix style