Fixed version conflict error#652

samtstern merged 1 commit intofirebase:version-2.0.0-devfirebase/FirebaseUI-Android:version-2.0.0-devfrom

DroidPulkit:version-2.0.0-devDroidPulkit/FirebaseUI-Android:version-2.0.0-devCopy head branch name to clipboard