OSDN Git Service

Merge from open-source gingerbread
authorJean-Baptiste Queru <jbq@google.com>
Sat, 15 Jan 2011 00:07:44 +0000 (16:07 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sat, 15 Jan 2011 00:07:54 +0000 (16:07 -0800)
Change-Id: I629fb99e0ed1d8e39892543792830b2c4b57ae1f


Trivial merge