OSDN Git Service

merge from froyo-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Wed, 9 Jun 2010 23:09:19 +0000 (16:09 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 9 Jun 2010 23:09:19 +0000 (16:09 -0700)
Change-Id: Iad8617b45d406e7f737bf68ed723755363d27e9b


Trivial merge