diff options
| author | Jesse Wilson <jessewilson@google.com> | 2011-02-07 15:44:20 -0800 |
|---|---|---|
| committer | Jesse Wilson <jessewilson@google.com> | 2011-02-07 15:44:20 -0800 |
| commit | 26ce8fbd8fe488cc969b08f64c56525662763dc4 (patch) | |
| tree | 2a373088ccdee60f7a415417898b409ac4fa28da /luni/src/main/java/javax/crypto/spec | |
| parent | b0dd42c2b44ef61f116a7eea0e13237f55e07c9f (diff) | |
| parent | 6186821cb13f4ac7ff50950c813394367e021eae (diff) | |
| download | libcore-26ce8fbd8fe488cc969b08f64c56525662763dc4.zip libcore-26ce8fbd8fe488cc969b08f64c56525662763dc4.tar.gz libcore-26ce8fbd8fe488cc969b08f64c56525662763dc4.tar.bz2 | |
resolved conflicts for merge of 6186821c to dalvik-dev
Change-Id: Ic6f0172767d6feedb188d3a5e7488a67702ef8c4
Diffstat (limited to 'luni/src/main/java/javax/crypto/spec')
| -rw-r--r-- | luni/src/main/java/javax/crypto/spec/PBEKeySpec.java | 2 | ||||
| -rw-r--r-- | luni/src/main/java/javax/crypto/spec/PSource.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/luni/src/main/java/javax/crypto/spec/PBEKeySpec.java b/luni/src/main/java/javax/crypto/spec/PBEKeySpec.java index c84cdcb..e1f0d96 100644 --- a/luni/src/main/java/javax/crypto/spec/PBEKeySpec.java +++ b/luni/src/main/java/javax/crypto/spec/PBEKeySpec.java @@ -19,7 +19,7 @@ package javax.crypto.spec; import java.security.spec.KeySpec; import java.util.Arrays; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * The key specification for a <i>password based encryption</i> key. diff --git a/luni/src/main/java/javax/crypto/spec/PSource.java b/luni/src/main/java/javax/crypto/spec/PSource.java index 5f520f3..0efa1e9 100644 --- a/luni/src/main/java/javax/crypto/spec/PSource.java +++ b/luni/src/main/java/javax/crypto/spec/PSource.java @@ -17,7 +17,7 @@ package javax.crypto.spec; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * The source of the label <code>L</code> as specified in <a |