Create android project
Create android project
Eclipse project files
Merge branch 'master' into android