OSDN Git Service

am 206edb63: am 71c9526e: am 99632b11: manual merge from froyo
authorJean-Baptiste Queru <jbq@google.com>
Fri, 7 May 2010 00:09:49 +0000 (17:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 May 2010 00:09:49 +0000 (17:09 -0700)

Trivial merge