From: Conley Owens <cco3@android.com>
Date: Thu, 9 Jun 2011 19:14:11 +0000 (-0700)
Subject: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
X-Git-Tag: android-x86-4.4-r1~3915^2~2^2~61
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7521344df2a5b0f05b4193902123ea5485dbf01e;p=android-x86%2Fframeworks-native.git

am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"

* commit 'd8b027b18f5a922ef729c6ee363eecb053358d47':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style
---

7521344df2a5b0f05b4193902123ea5485dbf01e