OSDN Git Service

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

Change-Id: I4bb89c8045d1aee0441882556819d0187a2349b8


Trivial merge