Merge "Add API to set tonal shadow color"

author TreeHugger Robot <treehugger-gerrit@google.com>

Wed, 31 Jan 2018 23:17:12 +0000 (23:17 +0000)

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

Wed, 31 Jan 2018 23:17:12 +0000 (23:17 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 31 Jan 2018 23:17:12 +0000 (23:17 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 31 Jan 2018 23:17:12 +0000 (23:17 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/view/View.java
Simple merge
diff --cc core/res/res/values/attrs.xml
Simple merge
diff --cc core/res/res/values/public.xml
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 31 Jan 2018 23:17:12 +0000 (23:17 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 31 Jan 2018 23:17:12 +0000 (23:17 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/view/View.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/attrs.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/public.xml	patch \|	diff1 \|	diff2 \|	blob \| history