OSDN Git Service

Merge from open-source gingerbread
authorJean-Baptiste Queru <jbq@google.com>
Thu, 3 Feb 2011 20:41:49 +0000 (12:41 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 3 Feb 2011 20:41:51 +0000 (12:41 -0800)
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52


Trivial merge