Change-Id: I8231b2327a3cc64f1b50ed30cf4e892b87163cf7
Signed-off-by: rational <rational@jupiter>
Merge branch 'master' of https://github.com/jljlmatu/testrepo.git

Conflicts:
	HelloWorld/src/com/test/Simple3.java