update encoding
add InetAddress
Merge remote-tracking branch 'origin/master'
update android.md
添加线程池笔记