Merge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev

am: d8a275a1d2

Change-Id: Id01768d67598b6f7ff93450b6df6e07d4f38ee06
This commit is contained in:
Justin Klaassen
2016-09-13 04:00:53 +00:00
committed by android-build-merger

Diff Content Not Available