| commit | dab863f7585a2b2c2e10119afd7c4bab1e920afd | [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 | 780fed7ab236dd4722cc9280353974c69db89305 | |
| parent | 30215039c4089648da02193981f6443776f2389a [diff] | |
| parent | 2c32a92c84445d312b0dee4c82f84c036f2ca651 [diff] |
am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" * commit 'd8b027b18f5a922ef729c6ee363eecb053358d47': stagefright aacenc/amrwbenc: Convert line breaks to Unix style