Merge "Decouple Content Name Locale from Content Language Locale"

author Brad Ebinger <breadley@google.com>

Tue, 3 Oct 2017 18:45:43 +0000 (18:45 +0000)

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

Tue, 3 Oct 2017 18:45:43 +0000 (18:45 +0000)
author Brad Ebinger <breadley@google.com>
Tue, 3 Oct 2017 18:45:43 +0000 (18:45 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 3 Oct 2017 18:45:43 +0000 (18:45 +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	Brad Ebinger <breadley@google.com>
	Tue, 3 Oct 2017 18:45:43 +0000 (18:45 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 3 Oct 2017 18:45:43 +0000 (18:45 +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