OSDN Git Service

Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into cp
authorElliott Hughes <enh@google.com>
Mon, 6 Oct 2014 23:58:53 +0000 (16:58 -0700)
committerElliott Hughes <enh@google.com>
Mon, 6 Oct 2014 23:58:53 +0000 (16:58 -0700)

Trivial merge