OSDN Git Service

Merge
authorJean-Baptiste Queru <jbq@google.com>
Thu, 20 Sep 2012 21:29:12 +0000 (14:29 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 20 Sep 2012 21:29:19 +0000 (14:29 -0700)
Change-Id: Iea7c5bb7e63962f680259c3b698f7eacb9098e5e


Trivial merge