From: Conley Owens <cco3@android.com>
Date: Mon, 18 Jul 2011 19:44:57 +0000 (-0700)
Subject: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
X-Git-Tag: android-x86-4.4-r1~3915^2~2^2~37
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8c5dd0061d6c2ee2223b6aa83e1f4ad1b7cb1e3f;p=android-x86%2Fframeworks-native.git

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

* commit '3edba93fd9bff8e2b22486271e6e816e3b233ae9':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
---

8c5dd0061d6c2ee2223b6aa83e1f4ad1b7cb1e3f