am ce1bfbb0: resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp

author Sanket Padawe <sanketpadawe@google.com>

Fri, 10 Oct 2014 05:15:52 +0000 (05:15 +0000)

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

Fri, 10 Oct 2014 05:15:52 +0000 (05:15 +0000)
author Sanket Padawe <sanketpadawe@google.com>
Fri, 10 Oct 2014 05:15:52 +0000 (05:15 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 10 Oct 2014 05:15:52 +0000 (05:15 +0000)
diff --cc res/values/arrays.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
author	Sanket Padawe <sanketpadawe@google.com>
	Fri, 10 Oct 2014 05:15:52 +0000 (05:15 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 10 Oct 2014 05:15:52 +0000 (05:15 +0000)
		1	2
res/values/arrays.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history