Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143

1 files changed, 29 insertions, 0 deletions

diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchModel.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchModel.java
new file mode 100644
index 000000000000..812ca6b0dc9b
--- /dev/null
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchModel.java
@@ -0,0 +1,29 @@
+package com.intellij.structuralsearch.plugin.ui;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: Maxim.Mossienko
+ * Date: Mar 25, 2004
+ * Time: 1:33:10 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class SearchModel {
+  private final Configuration config;
+  private Configuration shadowConfig;
+
+  public SearchModel(Configuration config) {
+    this.config = config;
+  }
+
+  public Configuration getConfig() {
+    return config;
+  }
+
+  public void setShadowConfig(Configuration shadowConfig) {
+    this.shadowConfig = shadowConfig;
+  }
+
+  public Configuration getShadowConfig() {
+    return shadowConfig;
+  }
+}