OSDN Git Service

Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am:...
authorEvan Laird <evanlaird@google.com>
Thu, 6 Jul 2017 16:42:43 +0000 (16:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 16:42:43 +0000 (16:42 +0000)
am: 4a17866abe

Change-Id: Ic38e272a6556d25c21b5842e66f70d9fc00d7afa


Trivial merge