Merge "Fix text appearances not working in colored button styles" into nyc-dev

author Chris Banes <chrisbanes@google.com>

Wed, 25 May 2016 17:57:11 +0000 (17:57 +0000)

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

Wed, 25 May 2016 17:57:12 +0000 (17:57 +0000)
author Chris Banes <chrisbanes@google.com>
Wed, 25 May 2016 17:57:11 +0000 (17:57 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 25 May 2016 17:57:12 +0000 (17:57 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Chris Banes <chrisbanes@google.com>
	Wed, 25 May 2016 17:57:11 +0000 (17:57 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 25 May 2016 17:57:12 +0000 (17:57 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history