Commits
Conley Owens authored and Android Git Automerger committed 8c6d777da0eM
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
Showing diff to799b7f0c1a8