OSDN Git Service

Merge "Merge "Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 6 Jul 2017 22:22:06 +0000 (22:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 22:22:06 +0000 (22:22 +0000)

Trivial merge