diff options
author | Elliott Hughes <enh@google.com> | 2010-03-30 17:47:11 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2010-03-31 08:53:56 -0700 |
commit | 2e43b95339579a2ea8b749d7598677bb44f2770f (patch) | |
tree | 23fd4a4b544de3146ae0516e745820a03f9ad6d7 /text/src | |
parent | da759115c60aed5f46c5dfa46016c48f0ac26057 (diff) | |
download | libcore-2e43b95339579a2ea8b749d7598677bb44f2770f.zip libcore-2e43b95339579a2ea8b749d7598677bb44f2770f.tar.gz libcore-2e43b95339579a2ea8b749d7598677bb44f2770f.tar.bz2 |
Add Java 6's Calendar API changes.
Also correct two javadoc mistakes I added, and bring back the latest harmony
java6 CalendarTest.
Bug: 2497395
Change-Id: If481390948ca93d5f709a8ed4585991889de9f8b
Diffstat (limited to 'text/src')
-rw-r--r-- | text/src/main/java/java/text/DateFormatSymbols.java | 2 | ||||
-rw-r--r-- | text/src/main/java/java/text/DecimalFormatSymbols.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/text/src/main/java/java/text/DateFormatSymbols.java b/text/src/main/java/java/text/DateFormatSymbols.java index 04ea750..b47ca83 100644 --- a/text/src/main/java/java/text/DateFormatSymbols.java +++ b/text/src/main/java/java/text/DateFormatSymbols.java @@ -151,7 +151,7 @@ public class DateFormatSymbols implements Serializable, Cloneable { * * @param locale the locale * @return an instance of {@code DateFormatSymbols} - * @exception NullPointerException if {@code locale == null} + * @throws NullPointerException if {@code locale == null} * @since 1.6 * @hide */ diff --git a/text/src/main/java/java/text/DecimalFormatSymbols.java b/text/src/main/java/java/text/DecimalFormatSymbols.java index 2236486..fa1de6d 100644 --- a/text/src/main/java/java/text/DecimalFormatSymbols.java +++ b/text/src/main/java/java/text/DecimalFormatSymbols.java @@ -118,7 +118,7 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable { * * @param locale the locale * @return an instance of {@code DecimalFormatSymbols} - * @exception NullPointerException if {@code locale == null} + * @throws NullPointerException if {@code locale == null} * @since 1.6 * @hide */ |