diff options
author | Owen Lin <owenlin@google.com> | 2009-11-20 11:24:05 +0800 |
---|---|---|
committer | Owen Lin <owenlin@google.com> | 2009-11-20 11:24:05 +0800 |
commit | 471fd0aa7dccebe4ac63e8202ee9227ccb52c83d (patch) | |
tree | 0bcb5e49816728306362956ff5edfa144ff72d75 /res/values/styles.xml | |
parent | e1706c13d469a163d811e29d33b86cc5d4bf67e9 (diff) | |
parent | 503560f0dc42d6185c61be06f8060dfd50d30d69 (diff) | |
download | packages_apps_LegacyCamera-471fd0aa7dccebe4ac63e8202ee9227ccb52c83d.zip packages_apps_LegacyCamera-471fd0aa7dccebe4ac63e8202ee9227ccb52c83d.tar.gz packages_apps_LegacyCamera-471fd0aa7dccebe4ac63e8202ee9227ccb52c83d.tar.bz2 |
resolved conflicts for merge of 503560f0 to eclair-mr2
Change-Id: I9516a46bf0602cdff0128bf36d4e8dfb6ddd3823
Diffstat (limited to 'res/values/styles.xml')
-rw-r--r-- | res/values/styles.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 04bd634..2e09e45 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -62,7 +62,6 @@ <item name="android:windowExitAnimation">@null</item> </style> <style name="IconIndicator"> - <item name="android:visibility">gone</item> <item name="android:layout_marginTop">10dp</item> <item name="android:layout_marginBottom">10dp</item> <item name="android:layout_width">wrap_content</item> |