Commits
Conley Owens authored and Android Git Automerger committed f139965e4acM
am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" * commit '45ddd42544167494cee7213ecddcb6f8057c86c0': stagefright aacenc/amrwbenc: Remove trailing whitespace
Showing diff tofc00b2ed4fa