OSDN Git Service

Merge from gingerbread
authorJean-Baptiste Queru <jbq@google.com>
Thu, 3 Feb 2011 21:17:49 +0000 (13:17 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 3 Feb 2011 21:17:49 +0000 (13:17 -0800)
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c


Trivial merge