summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2022-03-14Merge "Snap for 8294919 from 6cb79dee0c4cfc5acfc2bfd48be5a676f58efb92 to ↵caf/aosp-new/main-cg-testing-releaseAndroid Build Coastguard Worker1-1/+1
main-cg-testing-release" into main-cg-testing-release
2022-03-14Snap for 8294919 from 6cb79dee0c4cfc5acfc2bfd48be5a676f58efb92 to ↵Android Build Coastguard Worker1-1/+1
main-cg-testing-release Change-Id: Idb46f85229c0e238299bad0957dd82b2b114a61b
2022-03-08Merge "Move comment to license_note"caf/aosp-new/masterTreehugger Robot1-1/+1
2022-03-03Move comment to license_noteBob Badour1-1/+1
Comments not preserved during refresh. Test: m nothing Change-Id: I99e93202c263092fc5d1447d6a698bcac6656446
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li0-0/+0
Bug: 214455710 Merged-In: Ifbf3fa74207a5e6d23eba4806a9aec05cba44e95 Change-Id: I9b3b6019a4fab4740c2ecb2690572327f1dac092
2022-01-30Merge "Snap for 8132946 from 1523bc6d1ad2933d6c6a5ecdc845e24f0cb6f42b to ↵Android Build Coastguard Worker1-0/+2
main-cg-testing-release" into main-cg-testing-release
2022-01-30Snap for 8132946 from 1523bc6d1ad2933d6c6a5ecdc845e24f0cb6f42b to ↵Android Build Coastguard Worker1-0/+2
main-cg-testing-release Change-Id: I57f45ff3da516ef85f99e0acb530071282884dcf
2022-01-24Merge "Adding bt apex to lib required by it" am: 1523bc6d1aRoopa Sattiraju1-0/+2
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1932109 Change-Id: Ic1c5b75f7bab8d1c1b463c8f1bb1cd2563226dec
2022-01-24Merge "Adding bt apex to lib required by it"android-t-preview-2android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1caf/aosp-new/android-t-preview-1caf/aosp-new/android-s-v2-beta-3caf/aosp-new/android-s-qpr3-beta-1Roopa Sattiraju1-0/+2
2022-01-16Merge "Snap for 8084792 from bde6e2aac1ce740e44fe274b0fbc48fcf5cce9a7 to ↵Android Build Coastguard Worker1-0/+3
main-cg-testing-release" into main-cg-testing-release
2022-01-16Snap for 8084792 from bde6e2aac1ce740e44fe274b0fbc48fcf5cce9a7 to ↵Android Build Coastguard Worker1-0/+3
main-cg-testing-release Change-Id: I7d04a4ad4e06f3c141fb3b567cb0f198940452a1
2022-01-13Merge "Update cpe for vulnerability scanners" am: bde6e2aac1 am: 7e9be661ce ↵Elliott Hughes1-0/+3
am: 616a75ed35 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1914287 Change-Id: I6a7dfdca445f3c4758966d446e6e43872e6ac46c
2022-01-13Merge "Update cpe for vulnerability scanners" am: bde6e2aac1 am: 7e9be661ceElliott Hughes1-0/+3
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1914287 Change-Id: Id25b2bdc323fdcf3f6286eafc0410e939b6bc726
2022-01-13Merge "Update cpe for vulnerability scanners" am: bde6e2aac1Elliott Hughes1-0/+3
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1914287 Change-Id: Ib570d27b8096d1398a8002cdb84794ead4537734
2022-01-13Merge "Update cpe for vulnerability scanners"Elliott Hughes1-0/+3
2022-01-12Update cpe for vulnerability scannersMaria Uretsky1-0/+3
Bug: http://b/201572953 Change-Id: Ifbf3fa74207a5e6d23eba4806a9aec05cba44e95
2021-12-26Merge "Snap for 8029350 from e420fd085eff7adaa0e7d929761a6aee5ef57104 to ↵Android Build Coastguard Worker1-2/+2
main-cg-testing-release" into main-cg-testing-release
2021-12-26Snap for 8029350 from e420fd085eff7adaa0e7d929761a6aee5ef57104 to ↵Android Build Coastguard Worker1-2/+2
main-cg-testing-release Change-Id: I10251001f883bf50ca8a3fbf8d2c72fa174a11fb
2021-12-22Adding bt apex to lib required by itRoopa Sattiraju1-0/+2
Bug: 206121418 Test: Compiles against internal-master and aosp Change-Id: I39321f4edca53e0c5b98c222824730255db785e9
2021-12-16Merge "Renamed bluetooth apex name to com.android.bluetooth" am: e420fd085e ↵Etienne Ruffieux1-2/+2
am: b8d4028dec am: 171dbead43 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1924423 Change-Id: I96aafb19f2fa68b92b79f39b98a4a07b896a7cad
2021-12-16Merge "Renamed bluetooth apex name to com.android.bluetooth" am: e420fd085e ↵Etienne Ruffieux1-2/+2
am: b8d4028dec Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1924423 Change-Id: Ide1fed8b27c3f6f2a7af4f0d78a54346326baf73
2021-12-16Merge "Renamed bluetooth apex name to com.android.bluetooth" am: e420fd085eEtienne Ruffieux1-2/+2
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1924423 Change-Id: I82dd64b3c7f7dc07ec2d0e6ef5dfcf1132e9c1b5
2021-12-16Merge "Renamed bluetooth apex name to com.android.bluetooth"Etienne Ruffieux1-2/+2
2021-12-15Renamed bluetooth apex name to com.android.bluetoothEtienne Ruffieux1-2/+2
Tag: #feature Bug: 206614050 Test: Compiles Change-Id: Ieb03a907ba39b58ef012adb1927c967bcd4e684a
2021-10-10Merge "Snap for 7810574 from 46f474a606bb8da4a84d3f9ecef3a786701f3b15 to ↵Android Build Coastguard Worker2-2/+50
main-cg-testing-release" into main-cg-testing-release
2021-10-10Snap for 7810574 from 46f474a606bb8da4a84d3f9ecef3a786701f3b15 to ↵Android Build Coastguard Worker2-2/+50
main-cg-testing-release Change-Id: Ia619c22a01b8a13d3dcd0df8cf9684e1b8218afe
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 46f474a606 -s ours am: ↵Xin Li0-0/+0
5e101ce78f -s ours am: 903d9d0dc1 -s ours am: 5264103c44 -s ours am skip reason: Merged-In Ieab4bfb42317700fa96365e42e4df09dcd2929bf with SHA-1 a755076076 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1847208 Change-Id: Icaf737a231f60be994eea9894b9277073c093333
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 46f474a606 -s ours am: ↵Xin Li0-0/+0
5e101ce78f -s ours am: 903d9d0dc1 -s ours am skip reason: Merged-In Ieab4bfb42317700fa96365e42e4df09dcd2929bf with SHA-1 a755076076 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1847208 Change-Id: If6ffdf6a3f8db07df4e9f759f38e0734e95c8e65
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 46f474a606 -s ours am: ↵Xin Li0-0/+0
5e101ce78f -s ours am skip reason: Merged-In Ieab4bfb42317700fa96365e42e4df09dcd2929bf with SHA-1 a755076076 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1847208 Change-Id: I802f3344d4d5362f8a8fbc7fc360aead0e3a7a35
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 46f474a606 -s oursXin Li0-0/+0
am skip reason: Merged-In Ieab4bfb42317700fa96365e42e4df09dcd2929bf with SHA-1 a755076076 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1847208 Change-Id: Ide8b031764a11130158da3cb508535ddc1931dfa
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2caf/aosp-new/android-s-v2-preview-1Xin Li2-2/+50
2021-10-06Merge Android 12Xin Li2-2/+50
Bug: 202323961 Merged-In: Ieab4bfb42317700fa96365e42e4df09dcd2929bf Change-Id: Ic45e5b928636cf2ea9bc96b06a9cb1ecf17f84d1
2021-09-26Merge "Snap for 7768542 from 850c0d04cb7be7b6023e5dcdb4aaa22293d184e5 to ↵Android Build Coastguard Worker3-0/+0
main-cg-testing-release" into main-cg-testing-release
2021-09-26Snap for 7768542 from 850c0d04cb7be7b6023e5dcdb4aaa22293d184e5 to ↵Android Build Coastguard Worker3-0/+0
main-cg-testing-release Change-Id: I854b61ad36d279b112404ec52d5985b7bd349770
2021-09-25Merge "Remove external/protobuf/.gitmodules and submodule directories" am: ↵Treehugger Robot3-0/+0
850c0d04cb am: a755076076 am: 272fedad91 am: cee762521f Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1830605 Change-Id: I9ec936a42c868c1ac473b74fd398a2dddfc2e383
2021-09-25Merge "Remove external/protobuf/.gitmodules and submodule directories" am: ↵Treehugger Robot3-0/+0
850c0d04cb am: a755076076 am: 272fedad91 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1830605 Change-Id: Ifd19a29bc59034e49eb1f4a4fceb125a6adee386
2021-09-25Merge "Remove external/protobuf/.gitmodules and submodule directories" am: ↵Treehugger Robot3-0/+0
850c0d04cb am: a755076076 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1830605 Change-Id: I09c2e3d35686bd8401bd7e10e9a791547ce043d6
2021-09-25Merge "Remove external/protobuf/.gitmodules and submodule directories" am: ↵Treehugger Robot3-0/+0
850c0d04cb Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1830605 Change-Id: Ieab4bfb42317700fa96365e42e4df09dcd2929bf
2021-09-24Merge "Remove external/protobuf/.gitmodules and submodule directories"Treehugger Robot3-0/+0
2021-09-24Remove external/protobuf/.gitmodules and submodule directoriesRaman Tenneti3-0/+0
Android doesn't support .gitmodules in external directory. Bug: 152899985 Test: Presubmit-Verify Change-Id: Iee741eb576083e49931519ba68e238141e1f1049
2021-08-22Merge "Snap for 7664297 from fbf5d7b0814f2a11bd4bd3bab2607e128e3cbbcb to ↵Android Build Coastguard Worker2-0/+6
main-cg-testing-release" into main-cg-testing-release
2021-08-22Snap for 7664297 from fbf5d7b0814f2a11bd4bd3bab2607e128e3cbbcb to ↵Android Build Coastguard Worker2-0/+6
main-cg-testing-release Change-Id: Ic3eb7325832870db7bb555b6055d29a505880e25
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li0-0/+0
8f4acf9548 -s ours am: c03fe8cf8d -s ours am: ff981a3d21 -s ours am skip reason: Merged-In I6ad4a635e495c8142d4c55146a87968361f0913f with SHA-1 8c5cddaf70 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15571707 Change-Id: I9439f184d47d5b699c5ecfba625736fd1eb60110
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li0-0/+0
8f4acf9548 -s ours am: c03fe8cf8d -s ours am skip reason: Merged-In I6ad4a635e495c8142d4c55146a87968361f0913f with SHA-1 8c5cddaf70 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15571707 Change-Id: I0c82b2d35fca7d8d2e6561892ffe84a6990b638e
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li0-0/+0
8f4acf9548 -s ours am skip reason: Merged-In I6ad4a635e495c8142d4c55146a87968361f0913f with SHA-1 8c5cddaf70 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15571707 Change-Id: Ib11abe78f3c293790a64d35204c59a163c645f93
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2-2/+50
Merged-In: I6ad4a635e495c8142d4c55146a87968361f0913f Change-Id: I274372773c340f41dc99299a97132d44ea6375bd
2021-07-07[automerger skipped] Merge "Revert "Add ramdisk_available to ↵TreeHugger Robot0-0/+0
init_first_stage's deps"" into sc-dev am: 6821054858 am: 6dc46cc0d0 -s ours am skip reason: Merged-In Icb580f97c313753d3ad9b63d5f7c6d668e66467c with SHA-1 c14eaf4996 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15067036 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15167749 Change-Id: Idbe85d02a1dd2a6aa8b9293932dce8bb467edcd9
2021-07-07[automerger skipped] Merge "Revert "Add ramdisk_available to ↵TreeHugger Robot0-0/+0
init_first_stage's deps"" into sc-dev am: 6821054858 -s ours am: 8c5cddaf70 -s ours am skip reason: Merged-In Icb580f97c313753d3ad9b63d5f7c6d668e66467c with SHA-1 c14eaf4996 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15167749 Change-Id: I6161a87740c909a072f26f5caae4836f83e38054
2021-07-07Merge "Revert "Add ramdisk_available to init_first_stage's deps"" into ↵caf/aosp-new/android12L-devTreeHugger Robot1-1/+0
sc-dev am: 6821054858 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15167749 Change-Id: If5ac0249100ac9c45dc27678e8525abec721511b
2021-07-07[automerger skipped] Merge "Revert "Add ramdisk_available to ↵TreeHugger Robot0-0/+0
init_first_stage's deps"" into sc-dev am: 6821054858 -s ours am skip reason: Merged-In Icb580f97c313753d3ad9b63d5f7c6d668e66467c with SHA-1 c14eaf4996 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15067036 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15167749 Change-Id: I6ad4a635e495c8142d4c55146a87968361f0913f