OSDN Git Service

am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks...
authorConley Owens <cco3@android.com>
Thu, 9 Jun 2011 19:21:05 +0000 (12:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jun 2011 19:21:05 +0000 (12:21 -0700)
commite668c0b69896996040f394e0a95f71dd4b9c6257
treee91b6adecdf3de0a09c7b73e48a49797babb3edb
parent6a91953cc9bb8a48d867cc53e3cf5286d9a2f5ac
parent644f36eab4eb9911ad897c9caae68b9c5a72388f
am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"

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