OSDN Git Service

Merge 5137711109783dcbb20143d3e5cab2fa931218dd
authorJean-Baptiste Queru <jbq@google.com>
Wed, 15 Jun 2011 21:25:37 +0000 (14:25 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 15 Jun 2011 21:25:47 +0000 (14:25 -0700)
Change-Id: I5046a54648bdeea6f9661c46329d7b502f2f52b9


Trivial merge