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

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143

1 files changed, 20 insertions, 0 deletions

diff --git a/java/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter1.java b/java/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter1.java
new file mode 100644
index 000000000000..f9bdb275f3aa
--- /dev/null
+++ b/java/typeMigration/testData/refactoring/changeTypeSignature/PassedParameter1.java
@@ -0,0 +1,20 @@
+class A<T> {
+  void foo(T t){}
+  void bar(T t, int i){}
+}
+
+class B extends A<S<caret>tring>{
+  void foo(String t) {
+    super.foo(t);
+  }
+
+  void bar(String t, int i){
+    foo(t);
+    int k = i;
+    super.bar(t, k);
+  }
+
+  void bar1(String s) {
+    foo(s);
+  }
+}
\ No newline at end of file