tree bd03361cb827c5325199e9740b30fe77a6e8f8e6
parent f7836b985a0d3653eb3d6cb9e0ee0d46248e1772
parent b60141b23c80980ca925e6e844c9a42196ef290b
author Michael Wright <michaelwr@google.com> 1504216314 +0000
committer android-build-merger <android-build-merger@google.com> 1504216314 +0000

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

Change-Id: Ifc2015508739226259f16672f2176623397fe5ab