Merge "Add state machine model for skipping initial brightness ramps." into oc-dev

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

Tue, 6 Jun 2017 21:36:50 +0000 (21:36 +0000)

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

Tue, 6 Jun 2017 21:36:50 +0000 (21:36 +0000)
author Julius D'souza <jdsouza@google.com>
Tue, 6 Jun 2017 21:36:50 +0000 (21:36 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 6 Jun 2017 21:36:50 +0000 (21:36 +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>
	Tue, 6 Jun 2017 21:36:50 +0000 (21:36 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 6 Jun 2017 21:36:50 +0000 (21:36 +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