OSDN Git Service

reconcile froyo-release into gingerbread
authorJean-Baptiste Queru <jbq@google.com>
Mon, 27 Sep 2010 00:30:50 +0000 (17:30 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 27 Sep 2010 00:30:50 +0000 (17:30 -0700)
Change-Id: I2386774732d4d0d0e46a5791dfc1b8cbeb60494b


Trivial merge