Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1

	modified:   res/values/strings.xml