docs: move note from aosp.md to README.md

README.md

@@ -31,9 +31,18 @@ The Bazel plugin for Android Studio is built and released from  [AOSP](https://a
 Although the code in this repository and in AOSP share the same structure and core components, they have diverged from each other. 
 
 - Changes for IntelliJ and CLion plugins are *only* merged into the master branch of this repository. Users can request that certain fixes which are also needed for the Android Studio plugin get merged into the AOSP project. This will require the internal teams’ approval. 
-- Changes made by the internal Google teams are automatically exported to AOSP. These commits will regularly be cherry-picked to the master branch.
+- Changes made by the internal Google teams are automatically exported to AOSP. These commits will regularly be cherry-picked to the master branch. See next paragraph for details.
 - The master branch is not intended to be used to build the Android Studio with Bazel plugin; failures of the Android Studio plugin built from the master branch will not be addressed.
 
+### Cherry-picks from AOSP to this project
+
+After the migration of the Android Studio plugin to [AOSP](https://android.googlesource.com/platform/tools/adt/idea/+/refs/heads/mirror-goog-studio-main/aswb/), this process was interrupted for approximately five months.
+
+In November 2024, many changes from AOSP were cherry-picked in [6965](https://github.com/bazelbuild/intellij/pull/6965).
+Starting from that point, we have been making our best effort to apply AOSP changes to the [master branch](https://github.com/bazelbuild/intellij/tree/master).
+
+For this purpose, we use the Python tool [LeFrosch/intellij-aosp-merge](https://github.com/LeFrosch/intellij-aosp-merge), which is capable of adjusting paths from AOSP to this project's layout and allows us to compare revisions in AOSP and here.
+
 ## Installation
 
 You can find our plugin in the [JetBrains Marketplace](https://plugins.jetbrains.com/plugin/8609-bazel)