OSDN Git Service

Merge "Fix a flaky test."
authorFan Zhang <zhfan@google.com>
Fri, 26 May 2017 16:14:08 +0000 (16:14 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 26 May 2017 16:14:09 +0000 (16:14 +0000)

Trivial merge