Update HelloWorld.java
Merge remote-tracking branch 'choose_remote_name/master' into mirror

Conflicts:
	src/com/test/HelloWorld.java