Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Sun, 22 Nov 2015 16:10:37 +0000 (17:10 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Sun, 22 Nov 2015 16:10:37 +0000 (17:10 +0100)
commitecdb95fa0cef923d76ce8d17b2d535247707466b
tree6b0674daa49f0229925cde6a7580b932eec89073
parentdfcbaf95210191e820f24b6beb02db3e22cd0793
parentbbfa65cba65c658da5360089a1a209ae9d44f79a
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
src/com/owncloud/android/authentication/AuthenticatorActivity.java