tree eeebac43c081c7d3430b167567e09fde6facc95a
parent da494b94120bad138a2cc4eb7dac0557546ae519
parent 3259fc9acfc740a30b3a52bf70fe6e402d2d1010
author Conley Owens <cco3@android.com> 1311018470 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311018470 -0700

am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

* commit '45ddd42544167494cee7213ecddcb6f8057c86c0':
  stagefright aacenc/amrwbenc: Remove trailing whitespace