Merge "Make "Paste as plain text" resource string public." into oc-dev am: 7d4cf66b17

author Abodunrinwa Toki <toki@google.com>

Wed, 12 Apr 2017 09:24:28 +0000 (09:24 +0000)

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

Wed, 12 Apr 2017 09:24:28 +0000 (09:24 +0000)
author Abodunrinwa Toki <toki@google.com>
Wed, 12 Apr 2017 09:24:28 +0000 (09:24 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 09:24:28 +0000 (09:24 +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/res/res/values/public.xml
Simple merge
author	Abodunrinwa Toki <toki@google.com>
	Wed, 12 Apr 2017 09:24:28 +0000 (09:24 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 12 Apr 2017 09:24:28 +0000 (09:24 +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/res/res/values/public.xml	patch \|	diff1 \|	diff2 \|	blob \| history