Conflicts:
	bin/classes/com/example/taxisecurity/AverseActivity.class
	bin/classes/com/example/taxisecurity/BuildConfig.class

	bin/classes/com/example/taxisecurity/MainActivity$PlaceholderFragment.class
	bin/classes/com/example/taxisecurity/MainActivity.class
	bin/classes/com/example/taxisecurity/PlacesAutoCompleteAdapter.class
	bin/classes/com/example/taxisecurity/PlacesAutocompleteActivity.class
	bin/classes/com/example/taxisecurity/R$attr.class
	bin/classes/com/example/taxisecurity/R$color.class
	bin/classes/com/example/taxisecurity/R$dimen.class
	bin/classes/com/example/taxisecurity/R$drawable.class
	bin/classes/com/example/taxisecurity/R$id.class
	bin/classes/com/example/taxisecurity/R$integer.class
	bin/classes/com/example/taxisecurity/R$layout.class
	bin/classes/com/example/taxisecurity/R$menu.class
	bin/classes/com/example/taxisecurity/R$string.class
	bin/classes/com/example/taxisecurity/R$style.class
	bin/classes/com/example/taxisecurity/R$styleable.class
	bin/classes/com/example/taxisecurity/R$xml.class
	bin/classes/com/example/taxisecurity/R.class
	bin/classes/com/example/taxisecurity/aboutActivity.class
	bin/classes/com/example/taxisecurity/endSMSActivity.class
	bin/classes/com/example/taxisecurity/helpActivity.class
	bin/classes/com/example/taxisecurity/mapActivity.class
	bin/classes/com/example/taxisecurity/smsService.class
	bin/classes/com/example/taxisecurity/timeAllocatorActivity.class
	bin/classes/com/google/android/gms/R$attr.class
	bin/classes/com/google/android/gms/R$color.class
	bin/classes/com/google/android/gms/R$drawable.class
	bin/classes/com/google/android/gms/R$id.class
	bin/classes/com/google/android/gms/R$integer.class
	bin/classes/com/google/android/gms/R$string.class
	bin/classes/com/google/android/gms/R$styleable.class
	bin/classes/com/google/android/gms/R.class
com vindya