Update android sample code
Merge branch 'master' of github.com:calvinlee/code_snippets