# HG changeset patch
# User mfang
# Date 1302659886 25200
# Node ID bea2ab79ac15fc67e0da25a3719f67b4682fe0a5
# Parent  c70a26ba4d21bfef8db9d43e34b1b3960237375a# Parent  0fcc24435ae402b083a9e548121e23560b06e0f7
Merge

diff -r c70a26ba4d21 -r bea2ab79ac15 jdk/make/java/util/FILES_properties.gmk
--- a/jdk/make/java/util/FILES_properties.gmk	Mon Apr 11 16:19:20 2011 -0700
+++ b/jdk/make/java/util/FILES_properties.gmk	Tue Apr 12 18:58:06 2011 -0700
@@ -55,6 +55,7 @@
         sun/util/resources/LocaleNames_mt.properties \
         sun/util/resources/LocaleNames_nl.properties \
         sun/util/resources/LocaleNames_no.properties \
+        sun/util/resources/LocaleNames_no_NO_NY.properties \
         sun/util/resources/LocaleNames_pl.properties \
         sun/util/resources/LocaleNames_pt.properties \
         sun/util/resources/LocaleNames_pt_BR.properties \