tree d61af1e42211e9694f3a446976b3e558b5b802df
parent 9ff89495a4890191a0bc5dfddf28f23f79f23698
parent 98fcc4041d35831c7a65a6e2f0e61021e0fb37e2
author Conley Owens <cco3@android.com> 1311018162 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311018162 -0700

am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

* commit '98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
  stagefright aacenc/amrwbenc: Remove trailing whitespace