Merge "Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am: ab7af71c64" into oc-dr1-dev-plus-aosp am: 4a17866abe"
This commit is contained in:
committed by
Android (Google) Code Review
commit
982f04fef0