sync kumato
sync java files @kumato
Merge branch 'master' of https://github.com/qiangxu/android