OSDN Git Service

Merge "Fix timeout in a test utility method" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Thu, 28 Jul 2016 17:39:50 +0000 (17:39 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 28 Jul 2016 17:39:53 +0000 (17:39 +0000)

Trivial merge