test commeit barcnhe
Merge remote-tracking branch 'origin/mbp-locale' into imac27-locale

Conflicts:
	Android/HelloAndroidworldGit/res/values/strings.xml
Merge remote-tracking branch 'origin/imac27-locale' into mbp-locale