external storage error
Merge remote-tracking branch 'origin/master'

Conflicts:
	com.koushikdutta.backup/values/strings.xml