# HG changeset patch
# User lana
# Date 1425010769 28800
# Node ID 92bf22ed0621a458d5cada394e35937c97155c45
# Parent  fa782f3d1069b4ed248df7f9a965e4380feb8e70# Parent  779bf7a113f657009adfc92b368e53151ffa7157
Merge

diff -r fa782f3d1069 -r 92bf22ed0621 corba/src/java.corba/share/classes/javax/rmi/CORBA/GetORBPropertiesFileAction.java
--- a/corba/src/java.corba/share/classes/javax/rmi/CORBA/GetORBPropertiesFileAction.java	Thu Feb 26 15:57:37 2015 -0800
+++ b/corba/src/java.corba/share/classes/javax/rmi/CORBA/GetORBPropertiesFileAction.java	Thu Feb 26 20:19:29 2015 -0800
@@ -43,7 +43,6 @@
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import sun.security.action.GetPropertyAction;
 import java.util.Properties;
 
 class GetORBPropertiesFileAction implements PrivilegedAction {