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

1 files changed, 14 insertions, 0 deletions

diff --git a/java/typeMigration/testData/refactoring/typeMigration/t24/after/test.java b/java/typeMigration/testData/refactoring/typeMigration/t24/after/test.java
new file mode 100644
index 000000000000..6e0abdb55348
--- /dev/null
+++ b/java/typeMigration/testData/refactoring/typeMigration/t24/after/test.java
@@ -0,0 +1,14 @@
+public class Test {
+    D f;
+    C foo() {
+       return null;
+    }
+}
+class B extends Test {
+    C foo() {
+        return f;
+    }
+}
+
+class C {}
+class D extends C{}