OSDN Git Service

am b8062e17: am 0a310052: resolved conflicts for merge of f3565212 to froyo-plus...
authorrepo sync <enh@google.com>
Sun, 2 May 2010 23:13:41 +0000 (16:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 2 May 2010 23:13:41 +0000 (16:13 -0700)

Trivial merge