LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am dc0c2a2a: am 30648384: am a35cfcea: Merge "Refresh prebuilts for SpeedTracker sample" into lmp-docs

Browse Source 
* commit 'dc0c2a2aa7fbf7e6d585db162b24aa46e6e9688f':
  Refresh prebuilts for SpeedTracker sample
This commit is contained in:
Trevor Johns
2014-11-21 10:36:57 +00:00
committed by Android Git Automerger
parent 269c55d1bc dc0c2a2aa7
commit 0ae607613a
2 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/browseable/SpeedTracker/Application/AndroidManifest.xml
View File

@@ -12,7 +12,7 @@
android:glEsVersion="0x00020000" android:required="true"/> android:glEsVersion="0x00020000" android:required="true"/>
<uses-sdk <uses-sdk
android:minSdkVersion="18" android:minSdkVersion="18"
android:targetSdkVersion="19" /> android:targetSdkVersion="20" />
<application <application
android:name=".PhoneApplication" android:name=".PhoneApplication"

22
samples/browseable/SpeedTracker/Application/res/values-v21/template-styles.xml
View File

@@ -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>