tree 485b152b97bf8321fdd223f35587bb4294672be8
parent d0bcc3ce38f64245d2cd9a009f37680bba813563
parent 97e7d232f17011df560f43c951462153c37df6ae
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