OSDN Git Service

Merge remote-tracking branch 'goog/master' into jb-mr1-dev
authorEd Heyl <ed@google.com>
Thu, 26 Jul 2012 14:39:34 +0000 (07:39 -0700)
committerEd Heyl <ed@google.com>
Thu, 26 Jul 2012 14:39:34 +0000 (07:39 -0700)

Trivial merge