Skip to content
This repository has been archived by the owner on Oct 5, 2019. It is now read-only.

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 fd7221c commit b554edc
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 1 deletion.
1 change: 1 addition & 0 deletions .google/packaging.yaml
@@ -1,3 +1,4 @@

# GOOGLE SAMPLE PACKAGING DATA
#
# This file is used by Google as part of our samples packaging process.
Expand Down
8 changes: 7 additions & 1 deletion Application/build.gradle
@@ -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 @@ -37,6 +38,11 @@ android {
targetSdkVersion 22
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}

sourceSets {
main {
dirs.each { dir ->
Expand Down
Expand Up @@ -14,6 +14,7 @@
* limitations under the License.
*/


package com.example.android.cardemulation;

import android.os.Bundle;
Expand Down
1 change: 1 addition & 0 deletions Application/src/main/res/values-v21/base-colors.xml
Expand Up @@ -14,6 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->

<resources>


Expand Down
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
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">CardEmulation</string>
<string name="intro_message">
Expand Down
1 change: 1 addition & 0 deletions NOTICE
@@ -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
@@ -1,3 +1,4 @@

Android CardEmulation Sample
===================================

Expand Down

0 comments on commit b554edc

Please sign in to comment.