aboutsummaryrefslogtreecommitdiff
path: root/renderScript
diff options
context:
space:
mode:
authorHak Matsuda <hakuro@google.com>2014-02-06 15:37:37 -0800
committerHak Matsuda <hakuro@google.com>2014-02-06 15:37:37 -0800
commit538cb52989296e1a1feff9274840753f5be4c87b (patch)
tree9fb9fd839398f1bd9da15014a5f776fa3f49893a /renderScript
parentf8d6c1ae952c6ca6cb3f38e4cf8db31e5909f8d2 (diff)
downloadandroid-538cb52989296e1a1feff9274840753f5be4c87b.tar.gz
RenderScriptIntrinsicSample, Fixed resource duplication conflict between template and main.
Change-Id: I5f32bb4f99e5f5840e20c45e3a0db9586f91b69d
Diffstat (limited to 'renderScript')
-rw-r--r--renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/styles.xml5
1 files changed, 0 insertions, 5 deletions
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/styles.xml b/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/styles.xml
index 9cecf825..12eb9302 100644
--- a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/styles.xml
+++ b/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/styles.xml
@@ -13,11 +13,6 @@
-->
</style>
- <!-- Application theme. -->
- <style name="AppTheme" parent="AppBaseTheme">
- <!-- All customizations that are NOT specific to a particular API-level can go here. -->
- </style>
-
<style name="FullscreenTheme" parent="android:Theme.NoTitleBar">
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowBackground">@null</item>