OSDN Git Service

am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
authorConley Owens <cco3@android.com>
Thu, 9 Jun 2011 19:14:11 +0000 (12:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jun 2011 19:14:11 +0000 (12:14 -0700)
commit644f36eab4eb9911ad897c9caae68b9c5a72388f
tree6b8184ca3cef4b9304c1db5f7d09b8d1fc077b96
parent90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f
parentd8b027b18f5a922ef729c6ee363eecb053358d47
am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"

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