am 010bdd3c: Merge "Fix voice mail number to modify when insert H3G Denmark sim card...

author Amit Mahajan <amitmahajan@google.com>

Fri, 19 Sep 2014 04:09:03 +0000 (04:09 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Fri, 19 Sep 2014 04:09:03 +0000 (04:09 +0000)
author Amit Mahajan <amitmahajan@google.com>
Fri, 19 Sep 2014 04:09:03 +0000 (04:09 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 04:09:03 +0000 (04:09 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Amit Mahajan <amitmahajan@google.com>
	Fri, 19 Sep 2014 04:09:03 +0000 (04:09 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 19 Sep 2014 04:09:03 +0000 (04:09 +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