OSDN Git Service

Merge (ignore) from open-source master tree
authorJean-Baptiste Queru <jbq@google.com>
Tue, 31 Aug 2010 20:08:11 +0000 (13:08 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 31 Aug 2010 20:08:11 +0000 (13:08 -0700)
Change-Id: Ie735c3282ddc17c1e28e1069b714f3a310c221a2


Trivial merge