Merge branch 'master' into ank/studio-430
authorAndrei Kuznetsov <andrei.kuznetsov@jetbrains.com>
Fri, 1 Oct 2021 14:53:05 +0000 (17:53 +0300)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Fri, 1 Oct 2021 14:53:05 +0000 (14:53 +0000)
# Conflicts:
# community/android/android-debuggers/resources/messages/DatabaseInspectorBundle.properties
# community/android/android/src/com/android/tools/idea/gradle/variant/view/BuildVariantView.java
# community/android/android/src/com/android/tools/idea/testartifacts/junit/AndroidJUnitConfigurationType.java
# community/android/android/src/com/android/tools/idea/testartifacts/junit/AndroidJUnitConfigurations.java
# community/android/app-inspection/ide/resources/messages/AppInspectionBundle.properties
# community/android/compose-ide-plugin/src/main/java/androidx/compose/plugins/idea/ComposableAnnotator.kt
# community/android/profilers-android/src/com/android/tools/idea/profilers/stacktrace/IntelliJStackTraceGroup.java
# community/android/profilers-ui/src/com/android/tools/profilers/memory/MemoryClassSetView.java
# community/android/profilers-ui/testSrc/com/android/tools/profilers/memory/MemoryProfilerStageViewTest.java
# mobile-ide/mobile-native/kotlin-ultimate.mobile-native.iml

GitOrigin-RevId: 1c5b22426423f6bdbce028da0abf2ac54b19a0d4

1  2 
.idea/modules.xml
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
platform/testFramework/testSrc/tests/testGroups.properties

Simple merge