Android changes for alpha release
Merge branch 'master' of https://github.com/shossain035/library