am f7bb4044: Merge "Fix build." into honeycomb

* commit 'f7bb4044e3e11845fd0980ad2393236add5b32ac':
  Fix build.
This commit is contained in:
Elliott Hughes
2011-01-12 17:16:17 -08:00
committed by Android Git Automerger

View File

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