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

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143

1 files changed, 15 insertions, 0 deletions

diff --git a/java/typeMigration/testData/refactoring/changeTypeSignature/ReturnType1.java b/java/typeMigration/testData/refactoring/changeTypeSignature/ReturnType1.java
new file mode 100644
index 000000000000..9e01a295be05
--- /dev/null
+++ b/java/typeMigration/testData/refactoring/changeTypeSignature/ReturnType1.java
@@ -0,0 +1,15 @@
+class A<T> {
+  T foo(){
+    return null;
+  }
+}
+
+public class B extends A<S<caret>tring> {
+  String foo(){return null;}
+
+  void bar() {
+    foo();
+    if (foo() == null) return;
+    System.out.println(foo());
+  }
+}
\ No newline at end of file