commit 482bc3827d35b63415e5edc47086e36fb960ca01
author Elliott Hughes <enh@google.com> Thu Apr 16 15:45:53 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 16 15:45:53 2015 +0000
tree 69009465cab6bdae45842345980aeeaebbf10051
parent be68a62e0f6e53a9e6c43c280e82adbb4af59853
parent ce9a533c7103fb3469f833066fc05579d16b48f9

am ce9a533c: am 48e7e2ac: am 2e30bff1: Merge "Add Europe/Madrid."

* commit 'ce9a533c7103fb3469f833066fc05579d16b48f9':
  Add Europe/Madrid.

res/xml/timezones.xml

diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml
index 440d098..b6f1f1d 100644
--- a/res/xml/timezones.xml
+++ b/res/xml/timezones.xml
@@ -33,6 +33,7 @@
     <timezone id="Europe/Amsterdam"></timezone>
     <timezone id="Europe/Belgrade"></timezone>
     <timezone id="Europe/Brussels"></timezone>
+    <timezone id="Europe/Madrid"></timezone>
     <timezone id="Europe/Sarajevo"></timezone>
     <timezone id="Africa/Windhoek"></timezone>
     <timezone id="Africa/Brazzaville"></timezone>