OSDN Git Service

Merge "Fix tests"
authorTodd Kennedy <toddke@google.com>
Wed, 27 Jul 2016 17:31:34 +0000 (17:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 27 Jul 2016 17:31:35 +0000 (17:31 +0000)

Trivial merge