Bug fix
Merge branch 'release_1_2' of https://github.com/aghadiry/AndroidHelloWorld into release_1_2