diff options
| author | Jesse Wilson <jessewilson@google.com> | 2009-05-11 14:08:03 -0700 |
|---|---|---|
| committer | Jesse Wilson <jessewilson@google.com> | 2009-05-11 14:08:03 -0700 |
| commit | 13970a92a67826bfd12464079b9ccc173f9ab5a6 (patch) | |
| tree | 2fa80613de09924d57bafff9aed97ee9a9d0961c /logging | |
| parent | 8f45e4d2fbff696d718212723b1381b064d1a197 (diff) | |
| download | libcore-13970a92a67826bfd12464079b9ccc173f9ab5a6.zip libcore-13970a92a67826bfd12464079b9ccc173f9ab5a6.tar.gz libcore-13970a92a67826bfd12464079b9ccc173f9ab5a6.tar.bz2 | |
Squashed commit of the following:
commit 2e4a7b3a3accb25865fb4c5535168b0d6bcebae4
Merge: 81ff13e 6c7f7e7
Author: Jesse Wilson <jessewilson@jessewilson.mtv.corp.google.com>
Date: Mon May 11 13:47:02 2009 -0700
Update our auth/ package to Harmony r772995. This change is just whitespace, plus dropping the newly added GSS tests and sample data (Generic Security services, org.ietf.jgss).
Merge branch 'auth_772995' into auth_dalvik
Conflicts:
libcore/auth/.classpath
libcore/auth/META-INF/MANIFEST.MF
libcore/auth/build.xml
libcore/auth/make/exclude.common
libcore/auth/src/main/java/javax/security/auth/AuthPermission.java
libcore/auth/src/main/java/javax/security/auth/DestroyFailedException.java
libcore/auth/src/main/java/javax/security/auth/Destroyable.java
libcore/auth/src/main/java/javax/security/auth/PrivateCredentialPermission.java
libcore/auth/src/main/java/javax/security/auth/Subject.java
libcore/auth/src/main/java/javax/security/auth/SubjectDomainCombiner.java
libcore/auth/src/main/java/javax/security/auth/callback/CallbackHandler.java
libcore/auth/src/main/java/javax/security/auth/callback/PasswordCallback.java
libcore/auth/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java
libcore/auth/src/main/java/javax/security/auth/kerberos/KerberosKey.java
libcore/auth/src/main/java/javax/security/auth/login/LoginException.java
libcore/auth/src/main/java/javax/security/auth/x500/X500Principal.java
libcore/auth/src/main/java/org/apache/harmony/auth/login/DefaultConfiguration.java
libcore/auth/src/main/native/auth/unix/exports.txt
libcore/auth/src/main/native/auth/unix/makefile
libcore/auth/src/main/native/auth/windows/makefile
libcore/auth/src/test/java/common/org/ietf/jgss/OidTest.java
commit 81ff13ec7ae480ac783f692f38c845f502b49809
Author: Jesse Wilson <jessewilson@jessewilson.mtv.corp.google.com>
Date: Fri May 8 17:53:27 2009 -0700
Stripped @since tags
commit 8b4d0e9b66d8d674a56a26f0d1bc111f9d2faa8d
Author: Jesse Wilson <jessewilson@jessewilson.mtv.corp.google.com>
Date: Fri May 8 17:40:36 2009 -0700
Auth dalvik.
commit 6c7f7e7d41393869e3900ad224bf32a26378d723
Author: Jesse Wilson <jessewilson@jessewilson.mtv.corp.google.com>
Date: Fri May 8 17:39:48 2009 -0700
Auth 772995
commit ed7f6150f8235006c59afab862d30d6033b02460
Author: Jesse Wilson <jessewilson@jessewilson.mtv.corp.google.com>
Date: Fri May 8 17:38:12 2009 -0700
Auth 527399
Diffstat (limited to 'logging')
0 files changed, 0 insertions, 0 deletions