tree ab22d93d34197b049cada8324e6a9388499d04e4
parent c26d7f362416325c278443d187f32d723f1b3f33
parent 1e6e1ffeaa1806e2d06188941b5674cce55003c4
author Justin Klaassen <justinklaassen@google.com> 1468976796 +0000
committer android-build-merger <android-build-merger@google.com> 1468976796 +0000

Merge \"Add SETTINGS_CONDITION_NIGHT_DISPLAY\" into nyc-mr1-dev
am: 1e6e1ffeaa

Change-Id: I0204b25d35585c39ebea8ab797f00e1c027b86c5