commit 48e7e2ac182b94b7c2b682874d0dea969b59339a
author Elliott Hughes <enh@google.com> Thu Apr 16 15:24:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 16 15:24:40 2015 +0000
tree eb23c292fa022e8776af6cb0ea318e388e7de9fa
parent ff095ab05bc6660abd38d9de047ac467c2d070fc
parent 2e30bff1351fafd2bbad2c46c55515e74f5d027c

am 2e30bff1: Merge "Add Europe/Madrid."

* commit '2e30bff1351fafd2bbad2c46c55515e74f5d027c':
  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>