diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-02 14:58:27 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-04-02 14:58:27 -0700 |
| commit | 7f5b87692b49a3ae674eda76d5fd77ab49b97409 (patch) | |
| tree | fa325c76dfd271749bd784f96e5b4db349907d1d /keystore/java/android/security/KeyGeneratorSpec.java | |
| parent | f4f0671618c583f70ea64097062bd2c0b14ee704 (diff) | |
| parent | e7e705d49401ec86147a889f7dee2b342147d19b (diff) | |
resolved conflicts for merge of e7e705d4 to master
Change-Id: If3e8c985f4f122f9fb36aab206787aac1407a74e
Diffstat (limited to 'keystore/java/android/security/KeyGeneratorSpec.java')
| -rw-r--r-- | keystore/java/android/security/KeyGeneratorSpec.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystore/java/android/security/KeyGeneratorSpec.java b/keystore/java/android/security/KeyGeneratorSpec.java index 02b081665943..705838350f80 100644 --- a/keystore/java/android/security/KeyGeneratorSpec.java +++ b/keystore/java/android/security/KeyGeneratorSpec.java @@ -145,7 +145,7 @@ public class KeyGeneratorSpec implements AlgorithmParameterSpec { } /** - * Gets the time instant after which the key is no long valid for decryption and verification. + * Gets the time instant after which the key is no longer valid for decryption and verification. * * @return instant or {@code null} if not restricted. * @@ -156,7 +156,7 @@ public class KeyGeneratorSpec implements AlgorithmParameterSpec { } /** - * Gets the time instant after which the key is no long valid for encryption and signing. + * Gets the time instant after which the key is no longer valid for encryption and signing. * * @return instant or {@code null} if not restricted. */ |