OSDN Git Service

am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
authorConley Owens <cco3@android.com>
Mon, 18 Jul 2011 19:44:57 +0000 (12:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 18 Jul 2011 19:44:57 +0000 (12:44 -0700)
* commit '3edba93fd9bff8e2b22486271e6e816e3b233ae9':
  stagefright aacenc/amrwbenc: Remove trailing whitespace


Trivial merge