Merge branch 'master' into 'master'
[bitmask_android.git] / settings.gradle
1 include ':app', ':shapeshifter'