merging AndroidStudio 2.0

This commit is contained in:
Dmitry Avdeev
2016-04-14 19:28:32 +03:00
parent 364daf5b06
commit ec2e32b92b
@@ -22,6 +22,7 @@ import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import javax.swing.*;
import java.awt.*;
@@ -119,4 +120,9 @@ public class ActionLink extends LinkLabel implements DataProvider {
return null;
}
@TestOnly
public AnAction getAction() {
return myAction;
}
}