merge
Merge branch 'master' of github.com:calvarez-inzpiral/android_library_tests
merge
merge