Merge commit 'google/cupcake' into koolu-cupcake koolu-cupcake koolu-cupcake-testing origin/koolu-cupcake origin/koolu-cupcake-testing
authorBrian Code <Brian.Code@koolu.com>
Sat, 20 Dec 2008 22:18:12 +0000 (16:18 -0600)
committerBrian Code <Brian.Code@koolu.com>
Sat, 20 Dec 2008 22:18:12 +0000 (16:18 -0600)
commit43ba670452384fd473dec8247c1abcc0f5985c5f
tree3628698f3d2a2ec194aae977b22ecacff7a709a8
parent5c99ec8542ac15b5b7deff0acb1c49748a0d861d
parent2ebd1d2ce82c4f10284c70a28ea62535349a7334
Merge commit 'google/cupcake' into koolu-cupcake
audio/AudioIn/UNIX/src/audioinwrapper.cpp
config/en.us/Android.mk