diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-01-30 11:49:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-01-30 11:49:32 +0000 |
| commit | 5de992082bdd145349c27a08b9f3cd790b0de472 (patch) | |
| tree | 95eca457ce33ef495878f5b0e0ad9b8402aadfca /android-mainline/_____ANNOTATION-Android-kconfigs-and-build-scripts_____.patch | |
| parent | 4348e70ef1627d02b4725969f0396ac4edf40038 (diff) | |
| parent | 74cf2d4b4d963b7519a281d358d1453503bd00da (diff) | |
| download | common-patches-5de992082bdd145349c27a08b9f3cd790b0de472.tar.gz | |
Merge changes I7e8ab57e,I105900f4,I82b71d9c,Iaf936ad1,I6983bf67, ... into main
* changes:
aosp/android-mainline: update series (rebase onto v6.7-rc4)
aosp/android-mainline: update series
aosp/android-mainline: update series (rebase onto v6.7-rc3)
aosp/android-mainline: update series (rebase onto v6.7-rc2)
aosp/android-mainline: update series
aosp/android-mainline: update series (rebase onto v6.6-15119-g7f851936a0ca4)
aosp/android-mainline: update series
aosp/android-mainline: update series (rebase onto v6.6-15100-gc9d01179e185f)
aosp/android-mainline: update series (rebase onto v6.6-15029-gbe3ca57cfb777)
aosp/android-mainline: update series
aosp/android-mainline: update series
aosp/android-mainline: update series (rebase onto v6.6-13985-gd934aef6bb9ec)
aosp/android-mainline: update series (rebase onto v6.6-13255-gb06f58ad8e8c4)
aosp/android-mainline: update series (rebase onto v6.6-13233-gd99b91a99be43)
aosp/android-mainline: update series (rebase onto v6.6-12893-ge392ea4d4d008)
aosp/android-mainline: update series (rebase onto v6.6-12401-g8f6f76a6a29f3)
aosp/android-mainline: update series
aosp/android-mainline: update series
aosp/android-mainline: update series (rebase onto v6.6-11928-gbc3012f4e3a97)
aosp/android-mainline: update series (rebase onto v6.6-11644-g6803bd7956ca8)
aosp/android-mainline: update series (rebase onto v6.6-11432-g43468456c95b9)
aosp/android-mainline: update series (rebase onto v6.6-11379-g6ed92e559a2ea)
aosp/android-mainline: update series (rebase onto v6.6-11236-g90a300dc0553c)
aosp/android-mainline: update series
aosp/android-mainline: update series (rebase onto v6.6-11104-gedd8e84ae9514)
aosp/android-mainline: update series
Diffstat (limited to 'android-mainline/_____ANNOTATION-Android-kconfigs-and-build-scripts_____.patch')
| -rw-r--r-- | android-mainline/_____ANNOTATION-Android-kconfigs-and-build-scripts_____.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android-mainline/_____ANNOTATION-Android-kconfigs-and-build-scripts_____.patch b/android-mainline/_____ANNOTATION-Android-kconfigs-and-build-scripts_____.patch index 9d32409a..159ab542 100644 --- a/android-mainline/_____ANNOTATION-Android-kconfigs-and-build-scripts_____.patch +++ b/android-mainline/_____ANNOTATION-Android-kconfigs-and-build-scripts_____.patch @@ -17,7 +17,7 @@ Change-Id: I088def2072fa0e3e1c579610bc7c9d97d52fb06e diff --git a/ANNOTATIONS b/ANNOTATIONS --- a/ANNOTATIONS +++ b/ANNOTATIONS -@@ -24,3 +24,4 @@ networking changes +@@ -23,3 +23,4 @@ networking changes hardware-wrapped key support Android vendor hooks Android exports |