OSDN Git Service

Merge commit 'remotes/korg/cupcake' into merge
authorJean-Baptiste Queru <jbq@google.com>
Tue, 17 Mar 2009 23:08:02 +0000 (16:08 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 17 Mar 2009 23:08:02 +0000 (16:08 -0700)
commitbfaac6ab6a7c93e0aea69e68f9f0eaef7d8f7755
tree7d9d2c170dd29f126502056fe4c4b01ccd8c9dc2
parent89e750f8f329133f796196df3eae61edf173b6ed
parent4a68b3365c8c50aa93505e99ead2565ab73dcdb0
Merge commit 'remotes/korg/cupcake' into merge
audio/AudioIn/UNIX/src/audioinwrapper.cpp
config/en.us/Android.mk