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

* commit 'd75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
This commit is contained in:
Jean-Baptiste Queru 2012-01-13 11:25:09 -08:00 committed by Android Git Automerger
commit 0dc09a60af

Diff Content Not Available