summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-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 Dorokhine1-0/+1
2021-06-28Merge "Allow AppSearch's icing library access to libprotobuf." into sc-devAlexander Dorokhine1-0/+1
2021-06-24Add ramdisk_available to init_first_stage's deps am: b1bf82938fInseob Kim1-0/+1
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-03-23[automerger skipped] Backport null pointer check from upstream am: b866b6d10a...Colin Cross0-0/+0
2021-03-23Backport null pointer check from upstream am: b866b6d10aColin Cross1-0/+5
2021-03-22Merge "Add apex_available for com.android.tethering" am: 4eda109cf2 am: 1272a...Remi NGUYEN VAN1-0/+1
2021-03-22Merge "Add apex_available for com.android.tethering" am: 4eda109cf2 am: 1272a...Remi NGUYEN VAN1-0/+1
2021-03-22Merge "Add apex_available for com.android.tethering" am: 4eda109cf2Remi NGUYEN VAN1-0/+1
2021-03-21Merge "Add apex_available for com.android.tethering"android-s-beta-2android-s-beta-1Remi NGUYEN VAN1-0/+1
2021-03-18Add apex_available for com.android.tetheringRemi NGUYEN VAN1-0/+1
2021-02-25[LSC] Add LOCAL_LICENSE_KINDS to external/protobufBob Badour1-0/+33
2021-02-25Revert "[LSC] Add LOCAL_LICENSE_KINDS to external/protobuf"Bob Badour1-33/+0
2021-02-22[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/protobu...Treehugger Robot0-0/+0
2021-02-22Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/protobuf" am: 9eb1e691fb am:...Treehugger Robot1-0/+33
2021-02-22Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/protobuf" am: 9eb1e691fbTreehugger Robot1-0/+33
2021-02-22Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/protobuf"Treehugger Robot1-0/+33
2021-02-21[LSC] Add LOCAL_LICENSE_KINDS to external/protobufBob Badour1-0/+33
2021-02-21[LSC] Add LOCAL_LICENSE_KINDS to external/protobufBob Badour1-0/+33
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d87f0a6cce -s ou...Xin Li0-0/+0
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d87f0a6cce -s oursXin Li0-0/+0
2021-02-20Mark ab/7061308 as merged in stage.Xin Li0-0/+0
2021-02-10Backport null pointer check from upstreamColin Cross1-0/+5
2021-02-09Backport null pointer check from upstreamColin Cross1-0/+5
2021-02-04Merge "Fix license_type. Contains GPL" am: 759defa9aa am: a96e494136 am: cfb5...Treehugger Robot1-1/+2
2021-02-04Merge "Fix license_type. Contains GPL" am: 759defa9aa am: a96e494136Treehugger Robot1-1/+2
2021-02-04Merge "Fix license_type. Contains GPL" am: 759defa9aaTreehugger Robot1-1/+2
2021-02-04Merge "Fix license_type. Contains GPL"android-s-preview-1Treehugger Robot1-1/+2
2021-02-03Fix license_type. Contains GPLBob Badour1-1/+2
2021-01-28Merge "Revert "Revert "Make protobuf vendor_ramdisk_available.""" am: 90b1479...Josh Gao1-0/+1
2021-01-28Merge "Revert "Revert "Make protobuf vendor_ramdisk_available.""" am: 90b1479...Josh Gao1-0/+1
2021-01-28Merge "Revert "Revert "Make protobuf vendor_ramdisk_available.""" am: 90b1479488Josh Gao1-0/+1
2021-01-28Merge "Revert "Revert "Make protobuf vendor_ramdisk_available."""Josh Gao1-0/+1
2021-01-28Revert "Revert "Make protobuf vendor_ramdisk_available.""Josh Gao1-0/+1
2021-01-27Merge "Fix license_type. BSD is NOTICE" am: f1d1875a00 am: 6080d4e1fe am: 9f4...Treehugger Robot1-1/+1
2021-01-27Merge "Fix license_type. BSD is NOTICE" am: f1d1875a00 am: 6080d4e1feTreehugger Robot1-1/+1
2021-01-27Merge "Fix license_type. BSD is NOTICE" am: f1d1875a00Treehugger Robot1-1/+1
2021-01-26Merge "Fix license_type. BSD is NOTICE"Treehugger Robot1-1/+1
2021-01-26Merge "Revert "Make protobuf vendor_ramdisk_available."" am: e767ba580c am: 8...Jerome Gaillard1-1/+0
2021-01-26Merge "Revert "Make protobuf vendor_ramdisk_available."" am: e767ba580c am: 8...Jerome Gaillard1-1/+0
2021-01-26Merge "Revert "Make protobuf vendor_ramdisk_available."" am: e767ba580cJerome Gaillard1-1/+0
2021-01-26Merge "Revert "Make protobuf vendor_ramdisk_available.""Jerome Gaillard1-1/+0
2021-01-26Revert "Make protobuf vendor_ramdisk_available."Jerome Gaillard1-1/+0
2021-01-25Merge "Make protobuf vendor_ramdisk_available." am: caf5303224 am: e65431bd43...Josh Gao1-0/+1
2021-01-25Merge "Make protobuf vendor_ramdisk_available." am: caf5303224 am: e65431bd43Josh Gao1-0/+1
2021-01-25Merge "Make protobuf vendor_ramdisk_available." am: caf5303224Josh Gao1-0/+1