OSDN Git Service

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


Trivial merge