# HG changeset patch
# User mullan
# Date 1299523487 18000
# Node ID 2254c2c93b04aebe825d41afa397f1e34376d9c1
# Parent  8b25e0b1d00e077c333575578b6353026f584c35# Parent  fda3a3c1320f5b6f82fc9c61088d8b84e3676a17
Merge

diff -r 8b25e0b1d00e -r 2254c2c93b04 jdk/src/share/classes/javax/crypto/SecretKeyFactory.java
--- a/jdk/src/share/classes/javax/crypto/SecretKeyFactory.java	Mon Mar 07 14:43:11 2011 +0000
+++ b/jdk/src/share/classes/javax/crypto/SecretKeyFactory.java	Mon Mar 07 13:44:47 2011 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,6 @@
  * <p> Every implementation of the Java platform is required to support the
  * following standard <code>SecretKeyFactory</code> algorithms:
  * <ul>
- * <li><tt>AES</tt></li>
  * <li><tt>DES</tt></li>
  * <li><tt>DESede</tt></li>
  * </ul>