OSDN Git Service

Merge "Really fix tests."
authorBrian Carlstrom <bdc@google.com>
Wed, 27 Aug 2014 19:01:17 +0000 (19:01 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 27 Aug 2014 19:01:17 +0000 (19:01 +0000)

Trivial merge