OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Tue, 26 Feb 2013 22:03:05 +0000 (14:03 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 26 Feb 2013 22:03:05 +0000 (14:03 -0800)

Trivial merge