OSDN Git Service

Merge "Attempt to fix broken/flaky FadeTransitionTest" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 22 May 2017 22:07:11 +0000 (22:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 22 May 2017 22:07:18 +0000 (22:07 +0000)

Trivial merge