intial setup of andriod project
Merge from remote before initial project checkin.

Merge remote-tracking branch 'origin/master'