diff options
| author | 2014-10-28 16:33:32 +0000 | |
|---|---|---|
| committer | 2014-10-28 16:33:33 +0000 | |
| commit | ebee8a4d92a8e80b49feb51e9c9621c79398457c (patch) | |
| tree | 77f1f1d54ec1297a0bc166dffbe07c0ea144fa1d | |
| parent | f5c00c1c1136c9752b9c0157f9eca6385d7b9448 (diff) | |
| parent | 555f1986f106ccf1ec05f6e4118a19f9a6496dc5 (diff) | |
Merge "Replace minimum with maximum in method description." into lmp-mr1-dev
| -rw-r--r-- | core/java/android/os/ConditionVariable.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/ConditionVariable.java b/core/java/android/os/ConditionVariable.java index 07b221c81dba..1e820f945689 100644 --- a/core/java/android/os/ConditionVariable.java +++ b/core/java/android/os/ConditionVariable.java @@ -109,7 +109,7 @@ public class ConditionVariable * <p> * If the condition is already opened, return immediately. * - * @param timeout the minimum time to wait in milliseconds. + * @param timeout the maximum time to wait in milliseconds. * * @return true if the condition was opened, false if the call returns * because of the timeout. |