format.
Merge branch 'master' of https://github.com/AntonioDiaz/android.git