First android commit
Merge branch 'master' of ssh://git@github.com/elaq/android.git