summaryrefslogtreecommitdiff
path: root/tests/ActivityTests
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2018-05-14 17:23:55 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-05-14 17:23:55 -0700
commitceaf60dc187275ef7468ba565c6dcdb2dccea05b (patch)
tree157f7bc5643f887f18b6c34a056d96abbb6dffe3 /tests/ActivityTests
parente1f739d4bdd2ee6a5b33902974e155a792c0aebc (diff)
parent592590c3d2d0719fad275ecef9e3369e24ae8ffc (diff)
Merge "Fix errors caught by aapt2" am: ed90a673d4
am: 592590c3d2 Change-Id: I47bac881f38d638192418c4e664722cc71941f0d
Diffstat (limited to 'tests/ActivityTests')
-rw-r--r--tests/ActivityTests/res/values/themes.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/ActivityTests/res/values/themes.xml b/tests/ActivityTests/res/values/themes.xml
index c11d2e48834a..1c3053710e7f 100644
--- a/tests/ActivityTests/res/values/themes.xml
+++ b/tests/ActivityTests/res/values/themes.xml
@@ -17,8 +17,6 @@
<resources>
<style name="SlowDialog" parent="@android:style/Theme.Holo.Dialog">
<item name="android:windowAnimationStyle">@style/SlowDialog</item>
- </style>
- <style name="SlowDialog">
<item name="android:windowEnterAnimation">@anim/slow_enter</item>
<item name="android:windowExitAnimation">@anim/slow_exit</item>
</style>