DO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors...

author Julius D'souza <jdsouza@google.com>

Mon, 8 May 2017 21:05:10 +0000 (21:05 +0000)

committer android-build-merger <android-build-merger@google.com>

Mon, 8 May 2017 21:05:10 +0000 (21:05 +0000)
author Julius D'souza <jdsouza@google.com>
Mon, 8 May 2017 21:05:10 +0000 (21:05 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 8 May 2017 21:05:10 +0000 (21:05 +0000)
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	Julius D'souza <jdsouza@google.com>
	Mon, 8 May 2017 21:05:10 +0000 (21:05 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 8 May 2017 21:05:10 +0000 (21:05 +0000)
		1	2
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