Merge branch 'master' into 4.0.x (Plugin set multiarach)

This commit is contained in:
Ian Clelland 2014-12-22 23:19:56 -05:00
commit a696ff37f1

View File

@ -54,11 +54,11 @@ task wrapper(type: Wrapper) {
gradleVersion = '2.2.1'
}
ext.multiarch=false
// PLUGIN GRADLE EXTENSIONS START
// PLUGIN GRADLE EXTENSIONS END
ext.multiarch=false
android {
sourceSets {
main {