drrrrrrrrrrrr
Merge branch 'java' of https://github.com/xuanxing/ADP.git into java