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)
commit50b034725b9295f650d7807706c746f03158d247
treef949892f9d4299de57cbfad53d96970f7cb51df1
parenta5dbcdf0fcbcaab45c24b469d07291245848436d
parent7521344df2a5b0f05b4193902123ea5485dbf01e
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