commit 9d35c56726d9c1c6df7e8df79bdd88a50a9102d9
author Neil Fuller <nfuller@google.com> Wed Nov 29 16:42:41 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 29 16:42:41 2017 +0000
tree 34b39f7efb331f6b2a8ce5bc052b9bd58dca67d7
parent a604a87862ddda1dc120fe34df1cabff1a8e3d0a
parent 94c339fd3bf13747cbd46eee58ca0c2db4fd6d54

Merge "Add a settings entry to enable UTC to be selected"

packages/SettingsLib/res/xml/timezones.xml

diff --git a/packages/SettingsLib/res/xml/timezones.xml b/packages/SettingsLib/res/xml/timezones.xml
index 12d31cf..6a8d780 100644
--- a/packages/SettingsLib/res/xml/timezones.xml
+++ b/packages/SettingsLib/res/xml/timezones.xml
@@ -27,6 +27,7 @@
     <timezone id="Atlantic/South_Georgia"></timezone>
     <timezone id="Atlantic/Azores"></timezone>
     <timezone id="Atlantic/Cape_Verde"></timezone>
+    <timezone id="Etc/UTC"></timezone>
     <timezone id="Africa/Casablanca"></timezone>
     <timezone id="Europe/London"></timezone>
     <timezone id="Europe/Amsterdam"></timezone>