OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 333e73f 6c9c4ea)
am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
authorJames Dong <jdong@google.com>
Fri, 30 Jul 2010 21:52:05 +0000 (14:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Jul 2010 21:52:05 +0000 (14:52 -0700)
Merge commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp

* commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974':
  Added damr box for AMR (NB and WB) sample entry


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