Merge remote-tracking branch 'remotes/aosp/jb-mr1.1-release' into jb-4.2

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml

Conflicts:

	res/values/strings.xml
fix conflict