OSDN Git Service

Merge 37dbfcaf
authorJean-Baptiste Queru <jbq@google.com>
Thu, 7 Jul 2011 15:46:09 +0000 (08:46 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 7 Jul 2011 15:46:09 +0000 (08:46 -0700)
Change-Id: Iae55ecada8dc231c88bb87b32e8bd5e7b6a47bd0


Trivial merge