Merge "Fix build." into honeycomb

This commit is contained in:
Elliott Hughes
2011-01-12 17:14:43 -08:00
committed by Android (Google) Code Review

View File

@@ -354294,8 +354294,6 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<exception name="MissingResourceException" type="java.util.MissingResourceException">
</exception>
</method> </method>
<method name="getISO3Language" <method name="getISO3Language"
return="java.lang.String" return="java.lang.String"
@@ -354307,8 +354305,6 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<exception name="MissingResourceException" type="java.util.MissingResourceException">
</exception>
</method> </method>
<method name="getISOCountries" <method name="getISOCountries"
return="java.lang.String[]" return="java.lang.String[]"