merge with lolipop code

CyanogenMod · Nov 14, 2014 · c43a0e6 · c43a0e6
1 parent d075de3
commit c43a0e6
Show file tree

Hide file tree

Showing 1,122 changed files with 26,371 additions and 1,629 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,37 +1,6 @@
-# Can ignore specific files
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
 .DS_Store
-Thumbs.db
-
-# Use wildcards as well
-*~
-*.swp
-*.~
-
-# Can also ignore all directories and files in a directory.
-tmp/**/* 
-
-#ignore the binary
-bin/*
-
-#eclips stuff
-.project
-.classpath
-proguard-project.txt
-project.properties
-default.properties
-
-.~lock.designDoc.odt#
-
-*.class
-
-scr
-
-gen/*
-
-.gradle/*
-
-.idea/*
-
-build/*
-
-*.iml
+/build
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/Calculator/Calculator-Calculator.apk b/Calculator/Calculator-Calculator.apk
diff --git a/Calculator/Calculator-release.apk b/Calculator/Calculator-release.apk
diff --git a/Calculator/build.gradle b/Calculator/build.gradle
diff --git a/Calculator/libs/gdk.jar b/Calculator/libs/gdk.jar
diff --git a/Calculator/libs/wearable-preview-support.jar b/Calculator/libs/wearable-preview-support.jar