Peters Git server - pub/Android/ownCloud.git/commit

author	tobiasKaminsky <tobias@kaminsky.me>
	Thu, 29 Oct 2015 17:25:53 +0000 (18:25 +0100)
committer	tobiasKaminsky <tobias@kaminsky.me>
	Thu, 29 Oct 2015 17:25:53 +0000 (18:25 +0100)
commit	bfe9127dbe9e33453e379d7466d4b0650663a9fb
tree	a4bcc9b91ffb96b59aaeca3ca3ed195ce9ca0191	tree \| snapshot (tar.gz tar.bz2 zip)
parent	b23d07d8a134acf8a7632db6287376452739359f	commit \| diff

Merge remote-tracking branch 'remotes/upstream/material_fab' into beta

# Conflicts:
# src/com/owncloud/android/ui/activity/FileDisplayActivity.java

ownCloud Android App