Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev

author Santos Cordon <santoscordon@google.com>

Wed, 11 Jan 2017 03:02:52 +0000 (03:02 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 11 Jan 2017 03:02:55 +0000 (03:02 +0000)
author Santos Cordon <santoscordon@google.com>
Wed, 11 Jan 2017 03:02:52 +0000 (03:02 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 11 Jan 2017 03:02:55 +0000 (03:02 +0000)
diff --cc core/java/android/provider/Settings.java
Simple merge
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc services/core/java/com/android/server/display/DisplayPowerController.java
Simple merge
author	Santos Cordon <santoscordon@google.com>
	Wed, 11 Jan 2017 03:02:52 +0000 (03:02 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 11 Jan 2017 03:02:55 +0000 (03:02 +0000)
		1	2
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/display/DisplayPowerController.java	patch \|	diff1 \|	diff2 \|	blob \| history