dev2
Create test3.java
Merge branch 'master' into dev
bug:ffff