| commit | 695d014c6feb0751132e999082ebcb7e089a3245 | [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 | a0d1dcbece767615cfd7c039f0c4249351750d3a | |
| parent | cbaae3bfbd3a96aef34bb996e9e11945e18fdfc8 [diff] | |
| parent | dab863f7585a2b2c2e10119afd7c4bab1e920afd [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