OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5dbcdf 7521344)
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)
* commit '644f36eab4eb9911ad897c9caae68b9c5a72388f':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help