diff options
author | Aurimas Liutikas <aurimas@google.com> | 2019-02-14 01:06:10 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-02-14 01:06:10 -0800 |
commit | 69f07d10ee6fbe741876972bcccee85d382e4c20 (patch) | |
tree | 0edb37e8bc6ea8846f5eae0b6d5847717a3b0c3a | |
parent | 9e5a194930c7328641c0baa67288247032c64101 (diff) | |
parent | 0ddee15eff5b13bf5477606c6cef55fde37a382f (diff) | |
download | bouncycastle-69f07d10ee6fbe741876972bcccee85d382e4c20.tar.gz |
Merge "Fix the spelling error in ReasonsMask" am: bdfb209e7c
am: 0ddee15eff
Change-Id: I169c3fc039ab9d7bd258d7881d16a8dcf579b577
-rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jce/provider/ReasonsMask.java | 2 | ||||
-rw-r--r-- | repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/ReasonsMask.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/ReasonsMask.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/ReasonsMask.java index 04f5a063..4d384f5c 100644 --- a/bcprov/src/main/java/org/bouncycastle/jce/provider/ReasonsMask.java +++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/ReasonsMask.java @@ -69,7 +69,7 @@ class ReasonsMask * Intersects this mask with the given reasons mask. * * @param mask The mask to intersect with. - * @return The intersection of this and teh given mask. + * @return The intersection of this and the given mask. */ ReasonsMask intersect(ReasonsMask mask) { diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/ReasonsMask.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/ReasonsMask.java index 97de9683..cf953b79 100644 --- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/ReasonsMask.java +++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/ReasonsMask.java @@ -70,7 +70,7 @@ class ReasonsMask * Intersects this mask with the given reasons mask. * * @param mask The mask to intersect with. - * @return The intersection of this and teh given mask. + * @return The intersection of this and the given mask. */ ReasonsMask intersect(ReasonsMask mask) { |