commit abbe2d4c8a7d4801bb1ffa7487bfb07b19ccae7e
author Elliott Hughes <enh@google.com> Thu Apr 02 18:49:22 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 02 18:49:22 2015 +0000
tree aa100ad23e8fec17d64672e41fae711f400f5ad7
parent 43a0cbad1bc630aca89ff59208f8f5f6260f3efd
parent 483d7989deac12ea8ad51e7a0bc227289601fb1a

am 483d7989: am ff095ab0: am 189d7e8e: Merge "Add Europe/Istanbul timezone"

* commit '483d7989deac12ea8ad51e7a0bc227289601fb1a':
  Add Europe/Istanbul timezone

res/xml/timezones.xml

diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml
index 1c92c2d..440d098 100644
--- a/res/xml/timezones.xml
+++ b/res/xml/timezones.xml
@@ -38,6 +38,7 @@
     <timezone id="Africa/Brazzaville"></timezone>
     <timezone id="Asia/Amman"></timezone>
     <timezone id="Europe/Athens"></timezone>
+    <timezone id="Europe/Istanbul"></timezone>
     <timezone id="Asia/Beirut"></timezone>
     <timezone id="Africa/Cairo"></timezone>
     <timezone id="Europe/Helsinki"></timezone>