first commit on a win machine
Merge branch 'master' of https://github.com/ffuxaq/android