tree 4d54436f9d0ed116b921d5814a684707bf370210
parent bc08dd57fe03b29d5acf53ab21e382b8c5600d33
parent bcc2252eb16484cf58036146ea5034756dde8027
author Jean-Baptiste Queru <jbq@google.com> 1326482709 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326482709 -0800

am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

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