OSDN Git Service

manual merge
authorJean-Baptiste Queru <jbq@google.com>
Wed, 14 Apr 2010 17:29:49 +0000 (10:29 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 14 Apr 2010 17:29:49 +0000 (10:29 -0700)
Change-Id: I0a81f92831dabc518cfd33b40ea93fd496a1a01c


Trivial merge