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)
1  2 
audio/AudioIn/UNIX/src/audioinwrapper.cpp
config/en.us/Android.mk

Simple merge