OSDN Git Service

am e668c0b6: (-s ours) am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc...
authorConley Owens <cco3@android.com>
Fri, 10 Jun 2011 17:30:38 +0000 (10:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Jun 2011 17:30:38 +0000 (10:30 -0700)
commit6bea5574fbd134a4f6e535eb35efabbe5f6735dd
treea391a16652e856ed088baf870d69ccd2630df64f
parentdc22fa852d0dd478f5ef084c9b39c4f779db6e98
parent50b034725b9295f650d7807706c746f03158d247
am e668c0b6: (-s ours) am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"

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