support android pre GINGERBREAD by fallback to commit
Merge remote-tracking branch 'origin/master'