Merge branch 'gradle-appcompat-wip' of https://github.com/donnfelker/android-bootstrap into gradle-appcompat-wip

Conflicts:
	.gitignore
	app/build.gradle
	app/src/main/AndroidManifest.xml
	gradle/wrapper/gradle-wrapper.properties
	gradlew.bat

Author: danielkutik

.gitignore

@@ -7,6 +7,8 @@
 
 # Java class files
 *.class
+<<<<<<< HEAD
+classes/
 
 # generated files
 bin/

app/build.gradle

@@ -46,20 +46,6 @@ android {
         versionName '1.0'
     }
 
-    //sourceSets {
-    //    main {
-    //        manifest.srcFile 'AndroidManifest.xml'
-    //        java.srcDirs = ['src/main/java']
-    //        resources.srcDirs = ['src/main/java']
-    //        aidl.srcDirs = ['src/main/java']
-    //        renderscript.srcDirs = ['src/main/java']
-    //        res.srcDirs = ['res']
-    //        assets.srcDirs = ['assets']
-    //    }
-    //
-    //    //instrumentTest.setRoot('src/test/java')
-    //}
-
     // signingConfigs {
         // release {
             // storeFile file(System.getenv('ANDROID_KEYSTORE_PATH'))

app/default.properties

@@ -1,3 +1,3 @@
 
 # Project target.
-target=android-16
+target=android-19

app/pom.xml

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip