Merge "Enable notifications during an ongoing call" into oc-dev am: b94abe5e30

author Daniel Sandler <dsandler@android.com>

Wed, 10 May 2017 15:58:38 +0000 (15:58 +0000)

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

Wed, 10 May 2017 15:58:38 +0000 (15:58 +0000)
author Daniel Sandler <dsandler@android.com>
Wed, 10 May 2017 15:58:38 +0000 (15:58 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 10 May 2017 15:58:38 +0000 (15:58 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Daniel Sandler <dsandler@android.com>
	Wed, 10 May 2017 15:58:38 +0000 (15:58 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 10 May 2017 15:58:38 +0000 (15:58 +0000)
		1	2
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history