Merge pull request #1 from ronanhardiman/master

test2
Update android.java
Merge pull request #2 from ronanhardiman/patch-1

Patch 1