OSDN Git Service

Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
authorConley Owens <cco3@android.com>
Thu, 9 Jun 2011 18:12:04 +0000 (11:12 -0700)
committerAndroid Code Review <code-review@android.com>
Thu, 9 Jun 2011 18:12:04 +0000 (11:12 -0700)
commitc66e2523b9c53c9870b0a17f663926fd9bcf5d46
treea261cac5a69ebbc5cf717395918b6e0cdf6cd0be
parent16b844695ce2f7e7afbf0e604b956505c013561c
parent7b55adc7151c4a682e54365b86daa0e0e2dd57a0
Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"