OSDN Git Service

Merge from master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 14 Feb 2012 17:57:28 +0000 (09:57 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 14 Feb 2012 17:57:40 +0000 (09:57 -0800)
Change-Id: Ib9bc82ee0517945c5a713692d748042601d406ef


Trivial merge