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:44:16 +0000 (16:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 16:44:16 +0000 (16:44 +0000)
am: 763c1d1e24

Change-Id: I1705d3d1a3eed04689c72bd83251037ebda11d6f


Trivial merge