| commit | 1b79ba900efd074a12c51145be9ff4e934bdc488 | [log] [tgz] |
|---|---|---|
| author | Takeshi Hagikura <thagikura@google.com> | Tue Oct 14 19:38:09 2014 +0900 |
| committer | Takeshi Hagikura <thagikura@google.com> | Tue Oct 14 19:38:09 2014 +0900 |
| tree | a9e427371b562c90a73591910cc3dcdc6b4130cc | |
| parent | c9fa8401b6fafd30ff2cf712cd08405431f119da [diff] |
Keep up to date with lmp-release Change-Id: I4f681d3f51c55d0f6dc7dc7d12b4173a69d4f359
diff --git a/ui/views/CardView/Application/src/main/AndroidManifest.xml b/ui/views/CardView/Application/src/main/AndroidManifest.xml index b90c56b..6c4a9d9 100644 --- a/ui/views/CardView/Application/src/main/AndroidManifest.xml +++ b/ui/views/CardView/Application/src/main/AndroidManifest.xml
@@ -19,6 +19,9 @@ android:versionCode="1" android:versionName="1.0" > + <uses-sdk android:minSdkVersion="7" + android:targetSdkVersion="21" /> + <application android:allowBackup="true" android:icon="@drawable/ic_launcher"
diff --git a/ui/views/CardView/template-params.xml b/ui/views/CardView/template-params.xml index 7dc7719..6ff29b1 100644 --- a/ui/views/CardView/template-params.xml +++ b/ui/views/CardView/template-params.xml
@@ -26,7 +26,7 @@ <!-- change minSdk if needed--> <minSdk>21</minSdk> - <compileSdkVersion>"android-L"</compileSdkVersion> + <compileSdkVersion>21</compileSdkVersion> <dependency>com.android.support:cardview-v7:21.+</dependency>