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

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143

1 files changed, 10 insertions, 0 deletions

diff --git a/java/typeMigration/src/intentionDescriptions/ChangeClassParametersIntention/before.java.template b/java/typeMigration/src/intentionDescriptions/ChangeClassParametersIntention/before.java.template
new file mode 100644
index 000000000000..96eb1b46dbd2
--- /dev/null
+++ b/java/typeMigration/src/intentionDescriptions/ChangeClassParametersIntention/before.java.template
@@ -0,0 +1,10 @@
+public class X {
+    {
+        new Comparable<<spam>Object</spam>>() {
+            @Override
+            public int compareTo(Object o) {
+              return 0;
+            }
+        }
+    }
+}
\ No newline at end of file