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)
1  2 
src/com/owncloud/android/authentication/AuthenticatorActivity.java