initial commit
Merge http://github.com/estax/android