summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li0-0/+0
2022-01-24Merge "Adding bt apex to lib required by it" am: 1523bc6d1aRoopa Sattiraju1-0/+2
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-13Merge "Update cpe for vulnerability scanners" am: bde6e2aac1 am: 7e9be661ce a...Elliott Hughes1-0/+3
2022-01-13Merge "Update cpe for vulnerability scanners" am: bde6e2aac1 am: 7e9be661ceElliott Hughes1-0/+3
2022-01-13Merge "Update cpe for vulnerability scanners" am: bde6e2aac1Elliott Hughes1-0/+3
2022-01-13Merge "Update cpe for vulnerability scanners"Elliott Hughes1-0/+3
2022-01-12Update cpe for vulnerability scannersMaria Uretsky1-0/+3
2021-12-22Adding bt apex to lib required by itRoopa Sattiraju1-0/+2
2021-12-16Merge "Renamed bluetooth apex name to com.android.bluetooth" am: e420fd085e a...Etienne Ruffieux1-2/+2
2021-12-16Merge "Renamed bluetooth apex name to com.android.bluetooth" am: e420fd085e a...Etienne Ruffieux1-2/+2
2021-12-16Merge "Renamed bluetooth apex name to com.android.bluetooth" am: e420fd085eEtienne Ruffieux1-2/+2
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
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 46f474a606 -s ours am: 5e10...Xin Li0-0/+0
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 46f474a606 -s ours am: 5e10...Xin Li0-0/+0
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 46f474a606 -s ours am: 5e10...Xin Li0-0/+0
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 46f474a606 -s oursXin Li0-0/+0
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
2021-09-25Merge "Remove external/protobuf/.gitmodules and submodule directories" am: 85...Treehugger Robot3-0/+0
2021-09-25Merge "Remove external/protobuf/.gitmodules and submodule directories" am: 85...Treehugger Robot3-0/+0
2021-09-25Merge "Remove external/protobuf/.gitmodules and submodule directories" am: 85...Treehugger Robot3-0/+0
2021-09-25Merge "Remove external/protobuf/.gitmodules and submodule directories" am: 85...Treehugger Robot3-0/+0
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
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 8f4acf...Xin Li0-0/+0
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 8f4acf...Xin Li0-0/+0
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 8f4acf...Xin Li0-0/+0
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2-2/+50
2021-07-07[automerger skipped] Merge "Revert "Add ramdisk_available to init_first_stage...TreeHugger Robot0-0/+0
2021-07-07[automerger skipped] Merge "Revert "Add ramdisk_available to init_first_stage...TreeHugger Robot0-0/+0
2021-07-07Merge "Revert "Add ramdisk_available to init_first_stage's deps"" into sc-dev...caf/aosp-new/android12L-devTreeHugger Robot1-1/+0
2021-07-07[automerger skipped] Merge "Revert "Add ramdisk_available to init_first_stage...TreeHugger Robot0-0/+0
2021-07-07Merge "Revert "Add ramdisk_available to init_first_stage's deps"" into sc-devandroid-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_r16LA.AU.1.4.1.r1-00400-sa8155.0LA.AU.0.3.1.r2-06900-gen3meta.0LA.AU.0.3.1.r2-06700-gen3meta.0caf/refs/tags/android-12.0.0_r16caf/automotive-aosp.lnx.5.0.r1-relcaf/aosp-new/android12-qpr1-releasecaf/aosp-new/android12-qpr1-d-s3-releasecaf/aosp-new/android12-qpr1-d-s2-releasecaf/aosp-new/android12-qpr1-d-s1-releasecaf/aosp-new/android12-qpr1-d-releasecaf/aosp-new/android12-devTreeHugger Robot1-1/+0
2021-07-01Revert "Add ramdisk_available to init_first_stage's deps"Inseob Kim1-1/+0
2021-06-28Merge "Allow AppSearch's icing library access to libprotobuf." into sc-dev am...Alexander Dorokhine0-0/+0
2021-06-28Merge "Allow AppSearch's icing library access to libprotobuf." into sc-dev am...Alexander Dorokhine1-0/+1
2021-06-28Merge "Allow AppSearch's icing library access to libprotobuf." into sc-dev am...Alexander Dorokhine1-0/+1
2021-06-28Merge "Allow AppSearch's icing library access to libprotobuf." into sc-dev am...Alexander Dorokhine1-0/+1
2021-06-28Merge "Allow AppSearch's icing library access to libprotobuf." into sc-devAlexander Dorokhine1-0/+1
2021-06-24[automerger skipped] Add ramdisk_available to init_first_stage's deps am: b1b...Inseob Kim0-0/+0
2021-06-24[automerger skipped] Add ramdisk_available to init_first_stage's deps am: b1b...Inseob Kim0-0/+0
2021-06-24Add ramdisk_available to init_first_stage's deps am: b1bf82938fInseob Kim1-0/+1
2021-06-24[automerger skipped] Add ramdisk_available to init_first_stage's deps am: b1b...Inseob Kim0-0/+0
2021-06-23Add ramdisk_available to init_first_stage's depsInseob Kim1-0/+1
2021-06-21Allow AppSearch's icing library access to libprotobuf.Alexander Dorokhine1-0/+1
2021-06-21[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: fbf5d7b...Xin Li0-0/+0