dandreescu
diff --git a/‎.gitignore
+1 b/‎.gitignore
+1
diff --git a/‎.idea/libraries/asm_tools.xml
+11 b/‎.idea/libraries/asm_tools.xml
+11
diff --git a/‎.idea/libraries/bouncy_castle.xml
+10 b/‎.idea/libraries/bouncy_castle.xml
+10
diff --git a/‎.idea/libraries/builder_model.xml
+11 b/‎.idea/libraries/builder_model.xml
+11
diff --git a/‎.idea/libraries/commons_compress.xml
+9 b/‎.idea/libraries/commons_compress.xml
+9
diff --git a/‎.idea/libraries/easymock_tools.xml
+10 b/‎.idea/libraries/easymock_tools.xml
+10
diff --git a/‎.idea/libraries/freemarker_2_3_20.xml
+9 b/‎.idea/libraries/freemarker_2_3_20.xml
+9
diff --git a/‎.idea/libraries/guava_tools.xml
+11 b/‎.idea/libraries/guava_tools.xml
+11
diff --git a/‎.idea/libraries/javawriter.xml
+11 b/‎.idea/libraries/javawriter.xml
+11
diff --git a/‎.idea/libraries/kxml2.xml
+9 b/‎.idea/libraries/kxml2.xml
+9
diff --git a/‎.idea/libraries/lombok_ast.xml
+16 b/‎.idea/libraries/lombok_ast.xml
+16
diff --git a/‎.idea/libraries/mockito.xml
+11 b/‎.idea/libraries/mockito.xml
+11
diff --git a/‎.idea/modules.xml
+24-3 b/‎.idea/modules.xml
+24-3
diff --git a/‎.idea/vcs.xml
+2 b/‎.idea/vcs.xml
+2
diff --git a/‎build/scripts/layouts.gant
+1-3 b/‎build/scripts/layouts.gant
+1-3
diff --git a/‎getPlugins.bat
+2 b/‎getPlugins.bat
+2
diff --git a/‎getPlugins.sh
+2 b/‎getPlugins.sh
+2
@@ -1,3 +1,4 @@
+/android
 /config
 /system
 .idea/workspace.xml
 
@@ -254,9 +254,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
 }
 
 public def layoutCommunityPlugins(String home) {
-  if (isDefined("androidPluginHome")) {
-    layoutAndroid(p("androidPluginHome"))
-  }
+  layoutAndroid("$home/android")
 
   dir("plugins") {
     def simplePlugins = ["commander", "copyright", "java-i18n", "hg4idea", "github"] //, "tasks-time-tracking"]
 
@@ -0,0 +1,2 @@
+call git clone git://git.jetbrains.org/idea/android.git android
+call git clone git://git.jetbrains.org/idea/adt-tools-base.git android/tools-base
@@ -0,0 +1,2 @@
+git clone git://git.jetbrains.org/idea/android.git android
+git clone git://git.jetbrains.org/idea/adt-tools-base.git android/tools-base
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/android`
`1`	`2`	`/config`
`2`	`3`	`/system`
`3`	`4`	`.idea/workspace.xml`
Original file line number	Diff line number	Diff line change
`@@ -254,9 +254,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`public def layoutCommunityPlugins(String home) {`
`257`		`- if (isDefined("androidPluginHome")) {`
`258`		`- layoutAndroid(p("androidPluginHome"))`
`259`		`- }`
	`257`	`+ layoutAndroid("$home/android")`
`260`	`258`
`261`	`259`	`dir("plugins") {`
`262`	`260`	`def simplePlugins = ["commander", "copyright", "java-i18n", "hg4idea", "github"] //, "tasks-time-tracking"]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+call git clone git://git.jetbrains.org/idea/android.git android`
	`2`	`+call git clone git://git.jetbrains.org/idea/adt-tools-base.git android/tools-base`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+git clone git://git.jetbrains.org/idea/android.git android`
	`2`	`+git clone git://git.jetbrains.org/idea/adt-tools-base.git android/tools-base`