OSDN Git Service

am 0c0d3893: am 173de779: am b2520c7f: manual merge from froyo
authorJean-Baptiste Queru <jbq@google.com>
Fri, 7 May 2010 00:09:47 +0000 (17:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 May 2010 00:09:47 +0000 (17:09 -0700)

Trivial merge