DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am: bbfdf7ad23

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

Wed, 4 Jan 2017 23:11:51 +0000 (23:11 +0000)

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

Wed, 4 Jan 2017 23:11:51 +0000 (23:11 +0000)
author Julius D'souza <jdsouza@google.com>
Wed, 4 Jan 2017 23:11:51 +0000 (23:11 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 4 Jan 2017 23:11:51 +0000 (23:11 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Julius D'souza <jdsouza@google.com>
	Wed, 4 Jan 2017 23:11:51 +0000 (23:11 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 4 Jan 2017 23:11:51 +0000 (23:11 +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