Merge remote-tracking branch 'origin/master' · IFMO-Android-2015/homework5@b942d29 · GitHub

Commit

Merge remote-tracking branch 'origin/master'

Browse files

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/ru/ifmo/android_2015/homework5/InitSplashActivity.java
	app/src/main/java/ru/ifmo/android_2015/homework5/ProgressCallback.java
	app/src/main/res/values/strings.xml

Loading branch information

ermilova committed Dec 26, 2015

2 parents 2461838 + e7f6957 commit b942d29