tree 885f6f47cb7b14cb9a1efe128a92e6f3a3066d3e
parent fea4182582a15d9b25b3fef44e0f327c9513f5c7
parent 23af4ec04b579dd13bb8d42cfaa5ac5dfce3500c
author Ruben Brunk <rubenbrunk@google.com> 1473298023 +0000
committer android-build-merger <android-build-merger@google.com> 1473298023 +0000

Merge "Disable "Night Light" mode while in VR mode." into nyc-mr1-dev
am: 23af4ec04b

Change-Id: I1bd1a28595417ad06fcf548678870a1e5adfc092