merge in studio-master-weekly history after reset to studio-master-dev
diff --git a/android-studio-plugin/BUILD b/android-studio-plugin/BUILD
index b9b2505..766c2fb 100644
--- a/android-studio-plugin/BUILD
+++ b/android-studio-plugin/BUILD
@@ -41,5 +41,6 @@
"//tools/studio/google/cloud/tools/core-plugin:google-cloud-tools-core-as[module]",
"//tools/adt/idea/observable[module]",
"//tools/adt/idea/adt-ui[module]",
+ "//tools/adt/idea/wizard[module]",
],
)
diff --git a/android-studio-plugin/google-cloud-tools-as.iml b/android-studio-plugin/google-cloud-tools-as.iml
index 942880b..2ed572d 100644
--- a/android-studio-plugin/google-cloud-tools-as.iml
+++ b/android-studio-plugin/google-cloud-tools-as.iml
@@ -103,5 +103,6 @@
<orderEntry type="module" module-name="google-cloud-tools-core-as" />
<orderEntry type="module" module-name="observable" />
<orderEntry type="module" module-name="adt-ui" />
+ <orderEntry type="module" module-name="wizard" />
</component>
</module>
\ No newline at end of file
