OSDN Git Service

Merge remote-tracking branch 'goog/master' into merge
authorElliott Hughes <enh@google.com>
Sat, 27 Feb 2016 18:14:34 +0000 (10:14 -0800)
committerElliott Hughes <enh@google.com>
Sat, 27 Feb 2016 18:14:34 +0000 (10:14 -0800)

Trivial merge