Skip to content

Commit

Permalink
Auto-update
Browse files Browse the repository at this point in the history
  • Loading branch information
google-automerger committed May 21, 2015
1 parent c425fd5 commit 698480a
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 2 deletions.
1 change: 1 addition & 0 deletions .google/packaging.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# GOOGLE SAMPLE PACKAGING DATA
#
# This file is used by Google as part of our samples packaging process.
Expand Down
10 changes: 8 additions & 2 deletions Application/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@

buildscript {
repositories {
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'com.android.tools.build:gradle:1.1.0'
}
}

Expand Down Expand Up @@ -33,10 +34,15 @@ android {
buildToolsVersion "22.0.1"

defaultConfig {
minSdkVersion 18
minSdkVersion 21
targetSdkVersion 21
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}

sourceSets {
main {
dirs.each { dir ->
Expand Down
1 change: 1 addition & 0 deletions Application/src/main/res/values-v21/base-colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->

<resources>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->

<resources>

<!-- Activity themes -->
Expand Down
1 change: 1 addition & 0 deletions Application/src/main/res/values/base-strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->

<resources>
<string name="app_name">JobScheduler</string>
<string name="intro_message">
Expand Down
1 change: 1 addition & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

This sample uses the following software:

Copyright 2015 The Android Open Source Project
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

Android JobScheduler Sample
===================================

Expand Down

0 comments on commit 698480a

Please sign in to comment.