diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-04-27 14:55:53 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-04-27 14:55:53 -0700 |
| commit | 9053033a5076f82cf18b823c31f352e95e5bfd8d (patch) | |
| tree | 1d2a2611f56e786d7c3e40b8fd1b2e3d9aff9025 /java/util/src/main/java/com/google/protobuf/util/Timestamps.java | |
| parent | 067b1eec3bf852abaad0844999461baff8a5fdc8 (diff) | |
| parent | a6189acd18b00611c1dc7042299ad75486f08a1a (diff) | |
Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master
Diffstat (limited to 'java/util/src/main/java/com/google/protobuf/util/Timestamps.java')
| -rw-r--r-- | java/util/src/main/java/com/google/protobuf/util/Timestamps.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/util/src/main/java/com/google/protobuf/util/Timestamps.java b/java/util/src/main/java/com/google/protobuf/util/Timestamps.java index 1d631a2c..d0bac417 100644 --- a/java/util/src/main/java/com/google/protobuf/util/Timestamps.java +++ b/java/util/src/main/java/com/google/protobuf/util/Timestamps.java @@ -297,7 +297,7 @@ public final class Timestamps { * Convert a Timestamp to the number of microseconds elapsed from the epoch. * * <p>The result will be rounded down to the nearest microsecond. E.g., if the timestamp - * represents "1969-12-31T23:59:59.999999999Z", it will be rounded to -1 millisecond. + * represents "1969-12-31T23:59:59.999999999Z", it will be rounded to -1 microsecond. */ public static long toMicros(Timestamp timestamp) { checkValid(timestamp); |