Merge pull request #2 from suntinghui/master

android
Merge pull request #2 from liaojia/master

Merge pull request #2 from suntinghui/master