Merge "Stop fetching font data if the context is restricted." into oc-dev am: 4e45b1491a

author Seigo Nonaka <nona@google.com>

Thu, 20 Apr 2017 19:14:13 +0000 (19:14 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 20 Apr 2017 19:14:13 +0000 (19:14 +0000)
author Seigo Nonaka <nona@google.com>
Thu, 20 Apr 2017 19:14:13 +0000 (19:14 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 20 Apr 2017 19:14:13 +0000 (19:14 +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	Seigo Nonaka <nona@google.com>
	Thu, 20 Apr 2017 19:14:13 +0000 (19:14 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 20 Apr 2017 19:14:13 +0000 (19:14 +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