diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
| commit | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (patch) | |
| tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /java/java-tests/testData/refactoring/renameCollisions/RenameMethodNoCollisionWithOtherSignatureMethodRef.java | |
| parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
| parent | 02cf98d65c798d368fcec43ed64a001d513bdd4f (diff) | |
| download | idea-060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
build/scripts/tests.gant
Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784
Diffstat (limited to 'java/java-tests/testData/refactoring/renameCollisions/RenameMethodNoCollisionWithOtherSignatureMethodRef.java')
| -rw-r--r-- | java/java-tests/testData/refactoring/renameCollisions/RenameMethodNoCollisionWithOtherSignatureMethodRef.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/java/java-tests/testData/refactoring/renameCollisions/RenameMethodNoCollisionWithOtherSignatureMethodRef.java b/java/java-tests/testData/refactoring/renameCollisions/RenameMethodNoCollisionWithOtherSignatureMethodRef.java new file mode 100644 index 000000000000..dd815139efa5 --- /dev/null +++ b/java/java-tests/testData/refactoring/renameCollisions/RenameMethodNoCollisionWithOtherSignatureMethodRef.java @@ -0,0 +1,9 @@ +class Test { + + static void f<caret>oo() {} + static void foo2(int i) {} + + { + Runnable r = Test :: foo; + } +}
\ No newline at end of file |