From 28077b9cc86388f9b5dfa29a79a5a42c3d545d29 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Tue, 28 Apr 2015 13:35:25 -0700
Subject: [PATCH] Add Pacific/Noumea.

Also move Majuro to the right place in the list. It's +11, not -11.

(cherry-pick of 23ae8827c1bd86ec632eab42d067148f8b3452e8.)

Bug: http://b/20417019
Change-Id: I0148a33bf542e9fb5bec77f81216a82180053c3d
---
 res/xml/timezones.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml
index b6f1f1d88b..4426495b0c 100644
--- a/res/xml/timezones.xml
+++ b/res/xml/timezones.xml
@@ -1,5 +1,4 @@
 <timezones>
-    <timezone id="Pacific/Majuro"></timezone>
     <timezone id="Pacific/Midway"></timezone>
     <timezone id="Pacific/Honolulu"></timezone>
     <timezone id="America/Anchorage"></timezone>
@@ -84,6 +83,8 @@
     <timezone id="Asia/Vladivostok"></timezone>
     <timezone id="Pacific/Guam"></timezone>
     <timezone id="Asia/Magadan"></timezone>
+    <timezone id="Pacific/Noumea"></timezone>
+    <timezone id="Pacific/Majuro"></timezone>
     <timezone id="Pacific/Auckland"></timezone>
     <timezone id="Pacific/Fiji"></timezone>
     <timezone id="Pacific/Tongatapu"></timezone>
-- 
2.11.0