OSDN Git Service

Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into manualmerge
authorElliott Hughes <enh@google.com>
Thu, 30 Oct 2014 16:52:50 +0000 (09:52 -0700)
committerElliott Hughes <enh@google.com>
Thu, 30 Oct 2014 16:52:50 +0000 (09:52 -0700)

Trivial merge