tree 6b8184ca3cef4b9304c1db5f7d09b8d1fc077b96
parent 90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f
parent d8b027b18f5a922ef729c6ee363eecb053358d47
author Conley Owens <cco3@android.com> 1307646851 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307646851 -0700

am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"

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