fixed issue on android version 2.2
Merge remote-tracking branch 'origin/master'