diff options
| author | Trevor Johns <trevorjohns@google.com> | 2014-11-21 10:36:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 10:36:57 +0000 |
| commit | 0ae607613a3fa81c595e0f681abd41c4d26df887 (patch) | |
| tree | 170d4f5a10431b537ae0cad6339b069bccf8ad0f /samples | |
| parent | 269c55d1bc4ad59a13a39baeb2d7356a8d0d5108 (diff) | |
| parent | dc0c2a2aa7fbf7e6d585db162b24aa46e6e9688f (diff) | |
am dc0c2a2a: am 30648384: am a35cfcea: Merge "Refresh prebuilts for SpeedTracker sample" into lmp-docs
* commit 'dc0c2a2aa7fbf7e6d585db162b24aa46e6e9688f':
Refresh prebuilts for SpeedTracker sample
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/browseable/SpeedTracker/Application/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | samples/browseable/SpeedTracker/Application/res/values-v21/template-styles.xml | 22 |
2 files changed, 1 insertions, 23 deletions
diff --git a/samples/browseable/SpeedTracker/Application/AndroidManifest.xml b/samples/browseable/SpeedTracker/Application/AndroidManifest.xml index 3361a44df..97db73217 100644 --- a/samples/browseable/SpeedTracker/Application/AndroidManifest.xml +++ b/samples/browseable/SpeedTracker/Application/AndroidManifest.xml @@ -12,7 +12,7 @@ android:glEsVersion="0x00020000" android:required="true"/> <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="19" /> + android:targetSdkVersion="20" /> <application android:name=".PhoneApplication" diff --git a/samples/browseable/SpeedTracker/Application/res/values-v21/template-styles.xml b/samples/browseable/SpeedTracker/Application/res/values-v21/template-styles.xml deleted file mode 100644 index 134fcd9d3..000000000 --- a/samples/browseable/SpeedTracker/Application/res/values-v21/template-styles.xml +++ /dev/null @@ -1,22 +0,0 @@ -<!-- - Copyright 2014 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources> - - <!-- Activity themes --> - <style name="Theme.Base" parent="android:Theme.Material.Light" /> - -</resources> |
