tree 3df40789e9c1fc44e79b35c88951f8f1a5233187
parent 39f9b4db5354cde8f33e28ac95f4496ae1360fcb
parent 46c560fe9dc367c8f94400754143c4e05ae61c5a
author Android Build Merger (Role) <android-build-merger@google.com> 1499357798 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499357798 +0000

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