commit f6a8d7decd109fcc55ffb51ad6438c4fc67e6be9
author Tadashi G. Takaoka <takaoka@google.com> Fri Oct 03 14:52:13 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 03 14:52:13 2014 +0000
tree 2abc712b29b4b06a4762fbc2e2d1ec878cb64231
parent 6e724cfb668ad99f0d5c1e75c3a02d712991d5f6
parent 37ba3ddd542274819abfc024529ffbcd8f2e1790

am 37ba3ddd: Merge "Use Theme.DeviceDefault.Settings"

* commit '37ba3ddd542274819abfc024529ffbcd8f2e1790':
  Use Theme.DeviceDefault.Settings

java/res/values-v21/platform-theme.xml

diff --git a/java/res/values-v21/platform-theme.xml b/java/res/values-v21/platform-theme.xml
index 2a54798..58763fb 100644
--- a/java/res/values-v21/platform-theme.xml
+++ b/java/res/values-v21/platform-theme.xml
@@ -20,6 +20,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="platformActivityTheme" parent="@android:style/Theme.DeviceDefault.Light" />
-    <style name="platformSettingsTheme" parent="@android:style/Theme.DeviceDefault.Light" />
+    <style name="platformSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings" />
     <style name="platformDialogTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog" />
 </resources>