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

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143

1 files changed, 39 insertions, 0 deletions

diff --git a/java/typeMigration/testData/refactoring/typeMigration/t01/before/test.java b/java/typeMigration/testData/refactoring/typeMigration/t01/before/test.java
new file mode 100644
index 000000000000..1f7a52e4aa63
--- /dev/null
+++ b/java/typeMigration/testData/refactoring/typeMigration/t01/before/test.java
@@ -0,0 +1,39 @@
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: db
+ * Date: Oct 16, 2004
+ * Time: 10:10:35 PM
+ * To change this template use File | Settings | File Templates.
+ */
+
+class Foo {
+    Moo moo(int i) {
+        return null;
+    }
+}
+
+class Moo {
+    Foo foo(Integer[] j) {
+        return null;
+    }
+}
+
+class P {
+    int f(int y) {
+        return y;
+    }
+}
+
+class G extends P {
+    int f(int y) {
+        return y;
+    }
+}
+
+public class Test {
+    Moo g(Moo i) {
+        Foo j = i.foo(new Integer[0]);
+        return null;
+    }
+}