Merge "Add a builder for DynamicLayout and switch TextView to it"

author Roozbeh Pournader <roozbeh@google.com>

Thu, 24 Aug 2017 17:39:14 +0000 (17:39 +0000)

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

Thu, 24 Aug 2017 17:39:14 +0000 (17:39 +0000)
author Roozbeh Pournader <roozbeh@google.com>
Thu, 24 Aug 2017 17:39:14 +0000 (17:39 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 24 Aug 2017 17:39:14 +0000 (17:39 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/java/android/text/StaticLayout.java
Simple merge
author	Roozbeh Pournader <roozbeh@google.com>
	Thu, 24 Aug 2017 17:39:14 +0000 (17:39 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 24 Aug 2017 17:39:14 +0000 (17:39 +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
core/java/android/text/StaticLayout.java	patch \|	diff1 \|	diff2 \|	blob \| history