Update for Android Studio 1.0 RC
Update for Android Studio 1.0 RC
Merge branch 'keybase-proofs' of github.com:open-keychain/open-keychain into keybase-proofs