Version 2.13.0-146.0.dev

Merge commit 'cc0966948745a563a25ff69590971ee0fffa64da' into 'dev'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ae1e14..827df09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,13 @@
 - new lint: `use_named_constants`.
 - deprecation of `avoid_as`.
 
+## 2.12.2 - 2021-03-17
+
+This is a patch release that fixes crashes reported by Flutter 2 users (issue
+[flutter/flutter#78167][]).
+
+[flutter/flutter#78167]: https://github.com/flutter/flutter/issues/78167
+
 ## 2.12.1 - 2021-03-10
 
 This is a patch release that fixes:
diff --git a/tests/language/nonfunction_type_aliases/mixed/aliased_cyclic_superclass_error_lib.dart b/tests/language/nonfunction_type_aliases/mixed/aliased_cyclic_superclass_error_lib.dart
index 5cb088f..4453a67 100644
--- a/tests/language/nonfunction_type_aliases/mixed/aliased_cyclic_superclass_error_lib.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/aliased_cyclic_superclass_error_lib.dart
@@ -2,9 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-typedef T = C;
+import 'aliased_cyclic_superclass_error_test.dart';
 
-class C extends T {}
-//    ^
-// [analyzer] unspecified
-// [cfe] unspecified
+typedef T = C;
diff --git a/tests/language/nonfunction_type_aliases/mixed/aliased_cyclic_superclass_error_test.dart b/tests/language/nonfunction_type_aliases/mixed/aliased_cyclic_superclass_error_test.dart
index 282e4c2..b034e76 100644
--- a/tests/language/nonfunction_type_aliases/mixed/aliased_cyclic_superclass_error_test.dart
+++ b/tests/language/nonfunction_type_aliases/mixed/aliased_cyclic_superclass_error_test.dart
@@ -11,4 +11,9 @@
 
 import 'aliased_cyclic_superclass_error_lib.dart';
 
+class C extends T {}
+//    ^
+// [analyzer] unspecified
+// [cfe] unspecified
+
 main() => C();
diff --git a/tools/VERSION b/tools/VERSION
index 6c59975..41bc8a4 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
 MAJOR 2
 MINOR 13
 PATCH 0
-PRERELEASE 145
+PRERELEASE 146
 PRERELEASE_PATCH 0
\ No newline at end of file