OSDN Git Service

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


Trivial merge