OSDN Git Service

Merge 4b999030
authorJean-Baptiste Queru <jbq@google.com>
Wed, 18 May 2011 22:33:27 +0000 (15:33 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 18 May 2011 22:33:27 +0000 (15:33 -0700)
Change-Id: Ibb94ba77ec8588f5e7636cf6a038b143e3dcb2bd


Trivial merge