OSDN Git Service

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


Trivial merge