STH
Merge pull request #1 from liaojia/master

pull
Merge pull request #2 from suntinghui/master

android