Merge "Add attribute for controlling ripple radius"

author Alan Viverette <alanv@google.com>

Fri, 13 Feb 2015 20:53:12 +0000 (20:53 +0000)

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

Fri, 13 Feb 2015 20:53:13 +0000 (20:53 +0000)
author Alan Viverette <alanv@google.com>
Fri, 13 Feb 2015 20:53:12 +0000 (20:53 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 13 Feb 2015 20:53:13 +0000 (20:53 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc core/res/res/values/themes_material.xml
Simple merge
author	Alan Viverette <alanv@google.com>
	Fri, 13 Feb 2015 20:53:12 +0000 (20:53 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 13 Feb 2015 20:53:13 +0000 (20:53 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/themes_material.xml	patch \|	diff1 \|	diff2 \|	blob \| history