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

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143

1 files changed, 18 insertions, 0 deletions

diff --git a/java/typeMigration/testData/refactoring/typeMigration/t131/before/test.java b/java/typeMigration/testData/refactoring/typeMigration/t131/before/test.java
new file mode 100644
index 000000000000..7ee7852db3d4
--- /dev/null
+++ b/java/typeMigration/testData/refactoring/typeMigration/t131/before/test.java
@@ -0,0 +1,18 @@
+class Test {
+    static class E extends Exception { }
+    static interface I { void i(); }
+    static class E1 extends E implements I { public void i() { } }
+    static class E2 extends E implements I { public void i() { } }
+
+    void m(boolean f) {
+        try {
+            if (f)
+                throw new E1();
+            else
+                throw new E2();
+        } catch (E1 | E2 e) {
+            e.printStackTrace();
+            e.i();
+        }
+    }
+}
\ No newline at end of file