am fcce03b6: am 3c668bac: am 63b6320a: Merge "assist: Fix reported colors/styles...

author James Cook <jamescook@google.com>

Mon, 1 Jun 2015 15:46:20 +0000 (15:46 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Mon, 1 Jun 2015 15:46:20 +0000 (15:46 +0000)
author James Cook <jamescook@google.com>
Mon, 1 Jun 2015 15:46:20 +0000 (15:46 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:46:20 +0000 (15:46 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/widget/TextView.java
Simple merge
author	James Cook <jamescook@google.com>
	Mon, 1 Jun 2015 15:46:20 +0000 (15:46 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 1 Jun 2015 15:46:20 +0000 (15:46 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/widget/TextView.java	patch \|	diff1 \|	diff2 \|	blob \| history