Merge "Add hyphenationFrequency attribute to TextView and StaticLayout." into mnc-dev

author Roozbeh Pournader <roozbeh@google.com>

Tue, 12 May 2015 22:59:44 +0000 (22:59 +0000)

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

Tue, 12 May 2015 22:59:47 +0000 (22:59 +0000)
author Roozbeh Pournader <roozbeh@google.com>
Tue, 12 May 2015 22:59:44 +0000 (22:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 12 May 2015 22:59:47 +0000 (22:59 +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	Roozbeh Pournader <roozbeh@google.com>
	Tue, 12 May 2015 22:59:44 +0000 (22:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 12 May 2015 22:59:47 +0000 (22:59 +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