tree 52b4a6d30cc12dbfa7985d4d2c21af4a716b78a7
parent 382482915650b602975a293e8127e673e5339d25
parent 3b3171f4639b699f223baf38e35a93684f8aceed
author Android Build Merger (Role) <android-build-merger@google.com> 1499378396 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499378396 +0000

Merge "Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev am: 457c58f912" into oc-dr1-dev-plus-aosp