tree 69f75d331cdd7696a7d7498836eabd5df499f0ac
parent 47f4cbdf046abe0fd5a237b2798cf6ee5a3ddd12
parent b32153e3d2be154b36354765966da4c275f1620e
author Michael Wright <michaelwr@google.com> 1504220660 +0000
committer android-build-merger <android-build-merger@google.com> 1504220660 +0000

Merge "Don't always fallback to clockTick for EFFECT_TICK." into oc-mr1-dev am: b60141b23c
am: b32153e3d2

Change-Id: If9a5a28fc0ac20e63177945800518977b7aec872