Merge "Notification for MM reject cause code" into stage-aosp-master am: 9febdd0e9a

author Doris Xi <doris.xi@sonyericsson.com>

Thu, 23 Mar 2017 19:41:54 +0000 (19:41 +0000)

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

Thu, 23 Mar 2017 19:41:54 +0000 (19:41 +0000)
author Doris Xi <doris.xi@sonyericsson.com>
Thu, 23 Mar 2017 19:41:54 +0000 (19:41 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 23 Mar 2017 19:41:54 +0000 (19:41 +0000)
diff --cc core/res/res/values/strings.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Doris Xi <doris.xi@sonyericsson.com>
	Thu, 23 Mar 2017 19:41:54 +0000 (19:41 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 23 Mar 2017 19:41:54 +0000 (19:41 +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