aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-17Snap for 7468467 from 39254bbbba81dadb8a50570136573d0362366089 to ↵android-mainline-12.0.0_r90android-mainline-12.0.0_r76android-mainline-12.0.0_r48android-mainline-12.0.0_r31android-mainline-12.0.0_r121android-mainline-12.0.0_r11android-mainline-12.0.0_r106aml_mpr_311911090android12-mainline-mediaprovider-releaseandroid-build-team Robot
mainline-mediaprovider-release Change-Id: I9a5329df7c6233347733bfc863d2fc9d0e00628a
2021-05-04Merge "Update to v5.12 kernel headers." am: fad4f8fd49 am: 0ac04c2374 am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseChristopher Ferris
f684b983c7 am: 41e1fe5150 Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1694337 Change-Id: Ibc9c40fbde30f83473325d0a36a33fb552684790
2021-05-04Merge "Update to v5.12 kernel headers." am: fad4f8fd49 am: 0ac04c2374 am: ↵android-s-qpr3-beta-1android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid-s-qpr3-beta-1Christopher Ferris
f684b983c7 Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1694337 Change-Id: I1fb5ec883b2d8adc2a430f22a415ad678513e731
2021-05-04Merge "Update to v5.12 kernel headers." am: fad4f8fd49 am: 0ac04c2374Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1694337 Change-Id: I508d9dc47199fa095101ea7427df99bce7c0858e
2021-05-04Merge "Update to v5.12 kernel headers." am: fad4f8fd49Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1694337 Change-Id: I9798d988adbf20cd5b81d489bd515f1304a25907
2021-05-04Merge "Update to v5.12 kernel headers."android-s-beta-1Christopher Ferris
2021-05-03Update to v5.12 kernel headers.Christopher Ferris
Kernel headers coming from: Git: https://android.googlesource.com/kernel/common/ Branch: android-mainline Tag: android-mainline-5.12 Test: NA Change-Id: Ie05f9537ef2dd4833a6a711af4562f56a8d435e1
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d155501073 -s ↵Xin Li
ours am: 933545100f -s ours am: 1a37206fbe -s ours am skip reason: Change-Id If5cb3a2621d9b69b35030b0d7fd3ada239816197 with SHA-1 e80224644f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic7fb634d8747d949f85a6fbaccd5b16aec79e277
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d155501073 -s ↵Xin Li
ours am: 933545100f -s ours am skip reason: Change-Id If5cb3a2621d9b69b35030b0d7fd3ada239816197 with SHA-1 e80224644f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2b3cd327704315394da40d0a9273044710b5dad2
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d155501073 -s oursXin Li
am skip reason: Change-Id If5cb3a2621d9b69b35030b0d7fd3ada239816197 with SHA-1 e80224644f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iea7c149fa1870235618ff4eac10f02970be9b8c5
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: If5cb3a2621d9b69b35030b0d7fd3ada239816197 Change-Id: I091dc33e1091d4cac8fad1cd330c390e56a52f3f
2021-02-19Merge "Update to v5.11 kernel headers." am: c7e66e3bf4 am: 4a58a30302 am: ↵Christopher Ferris
62e6654965 am: f4ceee7dbe Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1593077 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I97178311fbb88a69f8d6be64e0ba06f03c736a68
2021-02-19Merge "Update to v5.11 kernel headers." am: c7e66e3bf4 am: 4a58a30302 am: ↵Christopher Ferris
62e6654965 Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1593077 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I385c147fb293ce1acb1e61fd1cf6c8e47a359b71
2021-02-19Merge "Update to v5.11 kernel headers." am: c7e66e3bf4 am: 4a58a30302Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1593077 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If0ca8a05c83ed034daff9a71d240ee1c18aa09ea
2021-02-19Merge "Update to v5.11 kernel headers." am: c7e66e3bf4Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1593077 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia91ee53e6f404b507ce1ae46f880d7fc7e94b525
2021-02-19Merge "Update to v5.11 kernel headers."Christopher Ferris
2021-02-16Update to v5.11 kernel headers.Christopher Ferris
Kernel headers coming from: Git: https://android.googlesource.com/kernel/common/ Branch: android-mainline Tag: android-mainline-5.11 Test: NA Change-Id: I226b5d0e5ff280e66b5feab6b7396ea5bd24b3c3
2020-12-15Merge "Update to v5.10 kernel headers." am: 1e3fe3e7c8 am: b20db4ac6c am: ↵Christopher Ferris
e80224644f Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1529758 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I630da809b83abcc68cfaa9266519900ce1ba7c62
2020-12-15Merge "Update to v5.10 kernel headers." am: 1e3fe3e7c8 am: b20db4ac6cChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1529758 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If5cb3a2621d9b69b35030b0d7fd3ada239816197
2020-12-15Merge "Update to v5.10 kernel headers." am: 1e3fe3e7c8Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1529758 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0b92e03a1525fe5affd5273b9191f4c58cc14ad9
2020-12-15Merge "Update to v5.10 kernel headers."android-s-preview-1Christopher Ferris
2020-12-14Update to v5.10 kernel headers.Christopher Ferris
Kernel headers coming from: Git: https://android.googlesource.com/kernel/common/ Branch: android-mainline Tag: android-mainline-5.10 Test: NA Change-Id: Ifba11e6771d8882a95864b789f80376b29f94a4d
2020-11-24Mark ab/6881855 as merged am: 1210edca30 am: 726e669270Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kernel-headers/+/13111007 Change-Id: I56fb20b1715a9150639aa76a0d6da81a6e829dee
2020-11-24Mark ab/6881855 as merged am: 1210edca30Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kernel-headers/+/13111007 Change-Id: I21b602bcab6533d7b4b3f10a797cff0f49cd75ae
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I645ffd65656ea7bd4618055b259376390723304c
2020-10-22Merge "Update to v5.9 kernel headers." am: a196ecc3f1 am: 223a2e2d0e am: ↵Christopher Ferris
abcc5ab389 am: 5fc98b0f4e Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1466451 Change-Id: Ie670b849e674e8eab857b756c664335670296dfe
2020-10-22Merge "Update to v5.9 kernel headers." am: a196ecc3f1 am: 223a2e2d0e am: ↵Christopher Ferris
abcc5ab389 Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1466451 Change-Id: I4465b321ba81b9129f1c3cf8db49d43f30c551f0
2020-10-22Merge "Update to v5.9 kernel headers." am: a196ecc3f1 am: 223a2e2d0eChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1466451 Change-Id: I934d19195db4d3f7dbef703f58bc19855f21214d
2020-10-22Merge "Update to v5.9 kernel headers." am: a196ecc3f1Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1466451 Change-Id: Ie67f1d95fdf5ffc891eae01087f8489aacf23f56
2020-10-22Merge "Update to v5.9 kernel headers."Christopher Ferris
2020-10-19Update to v5.9 kernel headers.Christopher Ferris
Kernel headers coming from: Git: https://android.googlesource.com/kernel/common/ Branch: android-mainline Tag: android-mainline-5.9 Test: NA Change-Id: Ib17f14ffee224a2db9c0e62d12333fc1bec64d43
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: f7daddefb1 -s ours am: ↵Xin Li
92b0b8e93e -s ours am: eb294cee36 -s ours am skip reason: Change-Id If1cba9653209608b170993c1f1bdfe251556aef4 with SHA-1 12518d39af is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kernel-headers/+/12796865 Change-Id: Idb5fe476f5d80366fee19ca140edfec0b92be851
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: f7daddefb1 -s ours am: ↵Xin Li
92b0b8e93e -s ours am skip reason: Change-Id If1cba9653209608b170993c1f1bdfe251556aef4 with SHA-1 12518d39af is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kernel-headers/+/12796865 Change-Id: I024c10bb442007da105abb7cb75f86ce3ac17e93
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: f7daddefb1 -s oursXin Li
am skip reason: Change-Id If1cba9653209608b170993c1f1bdfe251556aef4 with SHA-1 12518d39af is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kernel-headers/+/12796865 Change-Id: I44c3adfc98aad9531718db49733ce2942df09bcf
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: If1cba9653209608b170993c1f1bdfe251556aef4 Change-Id: I10e076fba2d0d38af06320ee45333f5fe158d14a
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cd8ae1d721 -s ours am: 696427b37b -s ours am: 567525eb91 -s ours am: 1146463ab0 -s ours am skip reason: Change-Id I321ea290944b9adef46fd5f680caf4893aa4b4a6 with SHA-1 b4f34ea308 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kernel-headers/+/12469928 Change-Id: I8887ef4f3a509b777c29bddec578dd388d7b529b
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cd8ae1d721 -s ours am: 696427b37b -s ours am: 567525eb91 -s ours am skip reason: Change-Id I321ea290944b9adef46fd5f680caf4893aa4b4a6 with SHA-1 b4f34ea308 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kernel-headers/+/12469928 Change-Id: I787b04eaaa44f11f43ec1e03ac2e6fd05c4c5382
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cd8ae1d721 -s ours am: 696427b37b -s ours am skip reason: Change-Id I321ea290944b9adef46fd5f680caf4893aa4b4a6 with SHA-1 b4f34ea308 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kernel-headers/+/12469928 Change-Id: Iae0853c1b8247b1e2d9ad36a6b06aeec0719c162
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cd8ae1d721 -s ours am skip reason: Change-Id I321ea290944b9adef46fd5f680caf4893aa4b4a6 with SHA-1 b4f34ea308 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kernel-headers/+/12469928 Change-Id: Icd798ea1c6d8b636e2b89bf8de86d22f873a5c08
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I321ea290944b9adef46fd5f680caf4893aa4b4a6 Change-Id: I35227fc8deb598a4174b1d74a2daad281ba446a5
2020-08-06Merge "Update to v5.8 kernel headers." am: c9541004dd am: fddc14235d am: ↵Christopher Ferris
7531701d06 am: 12518d39af am: bcb4ee71aa Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1389244 Change-Id: I792356fcf28629b3e558d8ed7ba3a5759c49b307
2020-08-06Merge "Update to v5.8 kernel headers." am: c9541004dd am: fddc14235d am: ↵Christopher Ferris
7531701d06 am: 12518d39af Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1389244 Change-Id: I40ef6fb253c38abeef8227756a987bdb14dc1208
2020-08-06Merge "Update to v5.8 kernel headers." am: c9541004dd am: fddc14235d am: ↵Christopher Ferris
7531701d06 Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1389244 Change-Id: If1cba9653209608b170993c1f1bdfe251556aef4
2020-08-06Merge "Update to v5.8 kernel headers." am: c9541004dd am: fddc14235dChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1389244 Change-Id: I6b335d6b2e804cd4afe473859176eb2f570a4a57
2020-08-06Merge "Update to v5.8 kernel headers." am: c9541004ddChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1389244 Change-Id: Ifc0b01b6f95a36afa739242a96e7df37f9c7b100
2020-08-06Merge "Update to v5.8 kernel headers."Christopher Ferris
2020-08-03Update to v5.8 kernel headers.Christopher Ferris
Kernel headers coming from: Git: https://android.googlesource.com/kernel/common/ Branch: android-mainline Tag: android-mainline-5.8 Test: NA Change-Id: I736145e51b84fdcdd1c99f8113453347ebeb5d80
2020-06-05Merge "Remove the arm kvm.h." am: e58316e074 am: 2434020edb am: b4f34ea308 ↵Christopher Ferris
am: fb62490dfe am: 431fb2fd93 Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1324020 Change-Id: I3298d4098d6d647a5aaf4e099a7d66b750e5b090
2020-06-05Merge "Remove the arm kvm.h." am: e58316e074 am: 2434020edb am: b4f34ea308 ↵Christopher Ferris
am: fb62490dfe Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1324020 Change-Id: I950cc1a68cc2cd64976ba12bb178bfdf0caf9b1b
2020-06-05Merge "Remove the arm kvm.h." am: e58316e074 am: 2434020edb am: b4f34ea308Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1324020 Change-Id: I08832c8ac18fca8741801bd0ab06c814156bf24b