OSDN Git Service

Merge from open-source gingerbread
authorJean-Baptiste Queru <jbq@google.com>
Thu, 3 Feb 2011 22:05:14 +0000 (14:05 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 3 Feb 2011 22:05:23 +0000 (14:05 -0800)
Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab


Trivial merge