summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-14 17:21:11 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-05-14 17:21:11 -0700
commit0c97c7c8562048135cc129044219f9bbdfc1f108 (patch)
tree4ab0f9ee147682c6f48529740c306f0b0062932d /core
parent14ad07f604ecd08436680a046363d37952c278f6 (diff)
parent670bf11fcf9e0a73007b9b814069aa575a872096 (diff)
downloadframeworks_base-0c97c7c8562048135cc129044219f9bbdfc1f108.zip
frameworks_base-0c97c7c8562048135cc129044219f9bbdfc1f108.tar.gz
frameworks_base-0c97c7c8562048135cc129044219f9bbdfc1f108.tar.bz2
Merge change 1668 into donut
* changes: Document exception from parse3339
Diffstat (limited to 'core')
-rw-r--r--core/java/android/text/format/Time.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/text/format/Time.java b/core/java/android/text/format/Time.java
index daa99c2..8f12355 100644
--- a/core/java/android/text/format/Time.java
+++ b/core/java/android/text/format/Time.java
@@ -438,6 +438,7 @@ public class Time {
*
* @param s the string to parse
* @return true if the resulting time value is in UTC time
+ * @throws android.util.TimeFormatException if s cannot be parsed.
*/
public boolean parse3339(String s) {
if (nativeParse3339(s)) {