OSDN Git Service

Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev
authorJason Monk <jmonk@google.com>
Thu, 6 Jul 2017 21:57:45 +0000 (21:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 21:57:45 +0000 (21:57 +0000)
am: 457c58f912

Change-Id: I0b37e6ac7195c94987534a4b2f6d593b3b94a36b


Trivial merge