Merge "Update strings for modem restricted state." into oc-dev am: 58977d1035

author Sanket Padawe <sanketpadawe@google.com>

Wed, 7 Jun 2017 22:01:52 +0000 (22:01 +0000)

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

Wed, 7 Jun 2017 22:01:52 +0000 (22:01 +0000)
author Sanket Padawe <sanketpadawe@google.com>
Wed, 7 Jun 2017 22:01:52 +0000 (22:01 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 7 Jun 2017 22:01:52 +0000 (22:01 +0000)
diff --cc core/res/res/values/strings.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Sanket Padawe <sanketpadawe@google.com>
	Wed, 7 Jun 2017 22:01:52 +0000 (22:01 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 7 Jun 2017 22:01:52 +0000 (22:01 +0000)
		1	2
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history