Merge remote-tracking branch 'origin/master' into ank/merge-212
authorAndrei Kuznetsov <andrei.kuznetsov@jetbrains.com>
Tue, 24 May 2022 05:10:25 +0000 (08:10 +0300)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Tue, 24 May 2022 05:10:25 +0000 (05:10 +0000)
# Conflicts:
# community/android/android-test-framework/testSrc/com/android/tools/idea/testing/AndroidGradleTestUtils.kt
# community/android/android/src/com/android/tools/idea/configurations/ThemeUtils.kt
# community/android/android/src/com/android/tools/idea/gradle/project/sync/GradleSyncState.kt
# community/android/android/src/com/android/tools/idea/gradle/project/upgrade/AgpUpgradeRefactoringProcessor.kt
# community/android/android/src/com/android/tools/idea/material/icons/download/MaterialIconsDownloader.kt
# community/android/android/src/com/android/tools/idea/run/deployment/UpdatableDeviceHelpTooltip.kt
# community/android/android/src/com/android/tools/idea/testartifacts/instrumented/testsuite/export/ImportUtils.kt
# community/android/android/testSrc/com/android/tools/idea/gradle/project/model/IdeLibraryFactoryTest.kt
# community/android/android/testSrc/com/android/tools/idea/lint/AndroidLintIdeSupportTest.kt
# community/android/android/testSrc/com/android/tools/idea/testing/TestLoggerTest.kt
# community/android/compose-designer/src/com/android/tools/idea/compose/preview/animation/AnimationInspectorPanel.kt
# community/android/designer/testSrc/com/android/tools/idea/uibuilder/visual/WindowSizeModelsProviderTest.kt
# community/android/nav/editor/testSrc/com/android/tools/idea/naveditor/editor/AddDestinationMenuTest.kt
# community/android/nav/editor/testSrc/com/android/tools/idea/naveditor/scene/decorator/DecoratorTest.kt
# community/android/profilers-android/testSrc/com/android/tools/idea/profilers/AndroidProfilerServiceTest.kt
# community/android/profilers/testSrc/com/android/tools/profilers/cpu/systemtrace/CpuKernelModelTest.kt
# community/android/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/ModelCache.kt

GitOrigin-RevId: c33c9c2de13c9658e38c513d2774d5bb16505a9e

1  2 
.idea/modules.xml
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt
platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginModelValidator.kt

Simple merge