project configuration
Merge branch 'master' of github.com:uber/uber-android-utils

Conflicts:
	.classpath