Merge "Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am: ab7af71c64" into oc-dr1-dev-plus-aosp am: 763c1d1e24"

This commit is contained in:
Android Build Merger (Role)
2017-07-06 16:45:33 +00:00
committed by Android (Google) Code Review

Diff Content Not Available