tree cf0dea76e394f4046cc2320b9f635275938286a0
parent d94b71de3b465c9c113f5b09c7cd5f221370af23
parent f139965e4acc8eadb57f1d18d34ea3a89ab622d0
author Conley Owens <cco3@android.com> 1311018922 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311018922 -0700

am f139965e: (-s ours) am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

* commit 'f139965e4acc8eadb57f1d18d34ea3a89ab622d0':
  stagefright aacenc/amrwbenc: Remove trailing whitespace