aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-07-15Snap for 7550930 from c2d8370656ab17db24cd5f9b969210487e0b4324 to ↵android-mainline-12.0.0_r94android-mainline-12.0.0_r80android-mainline-12.0.0_r65android-mainline-12.0.0_r52android-mainline-12.0.0_r35android-mainline-12.0.0_r16android-mainline-12.0.0_r124android-mainline-12.0.0_r108android12-mainline-resolv-releaseAndroid Build Coastguard Worker
mainline-resolv-release Change-Id: Ibf04e90bd2cdff048504ac6476549509d101520d
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4e8ceb8bf7 -s ↵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-releaseXin Li
ours am: 6df561c6af -s ours am: 6627ecc9dc -s ours am skip reason: Change-Id I921f2e386c79d3d97715a2fe08838f9e8593f4f8 with SHA-1 6383912c33 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3db6e5503837d02debeb95f68d865b80fa97d714
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4e8ceb8bf7 -s ↵android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-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-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-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-devandroid12--mainline-releaseandroid-s-qpr3-beta-1Xin Li
ours am: 6df561c6af -s ours am skip reason: Change-Id I921f2e386c79d3d97715a2fe08838f9e8593f4f8 with SHA-1 6383912c33 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I62ca7663845fac518e9b2b8fa3ca7e897471ee67
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4e8ceb8bf7 -s ourstemp_ab_7272582Xin Li
am skip reason: Change-Id I921f2e386c79d3d97715a2fe08838f9e8593f4f8 with SHA-1 6383912c33 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I29812ac27a5152d100179ff21bd15c208bab4cb7
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I921f2e386c79d3d97715a2fe08838f9e8593f4f8 Change-Id: I39b801db03cbffbd9553081ea1e6b69cbbaffe6b
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/gptfdisk am: 0d1c96baf5 am: ↵Bob Badour
7301e5dfcc am: 21f19075b4 am: 6ef5589726 Original change: https://android-review.googlesource.com/c/platform/external/gptfdisk/+/1588803 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic25058abb3daccb8cb443ad8c72a14bcf229b90b
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/gptfdisk am: 0d1c96baf5 am: ↵Bob Badour
7301e5dfcc am: 21f19075b4 Original change: https://android-review.googlesource.com/c/platform/external/gptfdisk/+/1588803 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib1bfc15a594f1c58945011bfb1f071db83229d89
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/gptfdisk am: 0d1c96baf5 am: 7301e5dfccBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/gptfdisk/+/1588803 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If49073be5196a88f4e6ff3825c2c6b909e141ad9
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/gptfdisk am: 0d1c96baf5Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/gptfdisk/+/1588803 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iecf1e2a973f3f4e98e844fe3990a0485b3dc224b
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/gptfdiskBob Badour
Added SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL to: Android.bp Added SPDX-license-identifier-GPL-2.0 to: fuzzer/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I0785453658ed08017a454b405b087db6ac6c2b77
2021-01-13Snap for 7080740 from d51a13ed28951299cdadd83ffe3d2b6df58d337a to ↵android-mainline-11.0.0_r21android-build-team Robot
mainline-resolv-release Change-Id: I27206eaa89b81f14f96822422a4f32b403109779
2021-01-06[automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: ↵Bill Yi
da4b51ba32 am: 9da9d5df0a -s ours am: 017f45f40d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/gptfdisk/+/1541047 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib5d18bedad0b892d2f05eb19912a8d6ea15b6b67
2021-01-06[automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: ↵Bill Yi
da4b51ba32 am: 9da9d5df0a -s ours am skip reason: Change-Id I77e4f30cdea1d0e938a0693d70b27796294a75be with SHA-1 a464be75d7 is in history Original change: https://android-review.googlesource.com/c/platform/external/gptfdisk/+/1541047 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9529cc10ebc82eccd8c003701bc4e592d7b0c97a
2021-01-06Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: da4b51ba32Bill Yi
Original change: https://android-review.googlesource.com/c/platform/external/gptfdisk/+/1541047 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2d32d2d7bf5e2916ce205021b4ea07948bb6e110
2021-01-05Merge RQ1A.210105.003 to aosp-master - DO NOT MERGEBill Yi
Merged-In: I77e4f30cdea1d0e938a0693d70b27796294a75be Change-Id: I45d2d1b2b51d7714187d23adc9a77ea70fe8581a
2021-01-05[automerger skipped] Merge RQ1A.210105.003 to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 78f93c69be -s ours am: a464be75d7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/13286847 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I920e1ca042649c1e727bc3eafae97f1860df282f
2021-01-05[automerger skipped] Merge RQ1A.210105.003 to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 78f93c69be -s ours am skip reason: Change-Id I921f2e386c79d3d97715a2fe08838f9e8593f4f8 with SHA-1 6383912c33 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/13286847 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I77e4f30cdea1d0e938a0693d70b27796294a75be
2021-01-05Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGEBill Yi
Merged-In: I921f2e386c79d3d97715a2fe08838f9e8593f4f8 Change-Id: I623b405e0b3b3125bc2d4036997b67b48268c2b7
2020-11-24Mark ab/6881855 as merged am: 5c854db65c am: 6383912c33Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/13111708 Change-Id: Ie18468dd35725e5ccfeb2a32ad332f5336a3e068
2020-11-24Mark ab/6881855 as merged am: 5c854db65cXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/13111708 Change-Id: I921f2e386c79d3d97715a2fe08838f9e8593f4f8
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I1337c3f3647ca6cae2ba329ef561f5deebfc8137
2020-11-18Merge cherrypicks of [13083486, 13083716, 13083431, 13083573, 13083545, ↵android-11.0.0_r29android-11.0.0_r27android-11.0.0_r26android11-qpr1-releaseandroid-build-team Robot
13083736, 13083575, 13083776, 13083778, 13083757, 13083547, 13083530, 13083719, 13083780, 13083739, 13083549, 13083741, 13083742, 13083590, 13083593, 13083594, 13083816, 13083818, 13083820, 13083822, 13083824, 13083827, 13083828, 13083552, 13083760, 13083762, 13083764, 13083782, 13083784, 13083831, 13083787, 13083766, 13083835, 13083745, 13083877, 13083720, 13083489, 13083491, 13083274, 13083859, 13083897] into rvc-qpr1-release Change-Id: I3e1cd62ccc6e6c005e8f8ab34b0b388cc25b5d7b
2020-11-18RESTRICT AUTOMERGEJasraj Bedi
ANDROID: Fix negative stack write in sgdisk A maliciously formatted USB or SD Card device when inserted into an Android device could crash sgdisk. This crash occurs because sgdisk does does not validate the number of cyclic partitions, which leads to an integer underflow ultimately causing a negative indexed stack write. Fix this by making sure the number of partitions don't go negative. After the fix, sgdisk detects the broken GPT and partitions it correctly Author: jasrajb@google.com Bug: 158063095 Test: before fix, sgdisk crashed when USB with malicious GPT was inserted Test: after fix, sgdisk didn't crash Test: went through the "formatting" wizard with a malicious GPT and sgdisk successfully reformatted it to vfat Change-Id: Ie0257a68f6a0140b98fb7d104dc2ffd1f5c2afde (cherry picked from commit 28ba37956b338e4d5c58f7d8c43c4153f057d482)
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: e384a934c4 am: 8e47293ec8 am: ↵Jasraj Bedi
0c7742cfa9 -s ours am: 18b974f125 -s ours am: 918b997bb8 am: f403760140 -s ours am: 6bb2d4e3a4 am: 8552eb33aa am: a882b43533 am: 6b608ed0b5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437458 Change-Id: I847bca27cdcb1c2201cf05e39f01184377223db4
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: e384a934c4 am: 8e47293ec8 am: ↵Jasraj Bedi
0c7742cfa9 -s ours am: 18b974f125 -s ours am: 918b997bb8 am: f403760140 -s ours am: 6bb2d4e3a4 am: 8552eb33aa am: f2b86eeedc am: 56e489fed6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437458 Change-Id: I59921722ae8037e9381378054b79afe092c1fac3
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: e384a934c4 am: 8e47293ec8 am: ↵Jasraj Bedi
0c7742cfa9 -s ours am: 18b974f125 -s ours am: 918b997bb8 am: f403760140 -s ours am: 6bb2d4e3a4 am: 8552eb33aa am: a882b43533 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437458 Change-Id: Ib63603a10c973ae75a5dd36a4232e281f51d5697
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: e384a934c4 am: 8e47293ec8 am: ↵Jasraj Bedi
0c7742cfa9 -s ours am: 18b974f125 -s ours am: 918b997bb8 am: f403760140 -s ours am: 6bb2d4e3a4 am: 8552eb33aa am: f2b86eeedc Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437458 Change-Id: I8fec8ae76d49376093fc09ea9dbdbb4edf1dc313
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: e384a934c4 am: 8e47293ec8 am: ↵android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseJasraj Bedi
0c7742cfa9 -s ours am: 18b974f125 -s ours am: 918b997bb8 am: f403760140 -s ours am: 6bb2d4e3a4 am: 8552eb33aa Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437458 Change-Id: Ic668e31fad1d67758d52e51e11e07649804c8494
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: e384a934c4 am: 8e47293ec8 am: ↵Jasraj Bedi
0c7742cfa9 -s ours am: 18b974f125 -s ours am: 918b997bb8 am: f403760140 -s ours am: 6bb2d4e3a4 am: d51a13ed28 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437458 Change-Id: I7683e358573f56f6e50842d027fd1907984e49c8
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: e384a934c4 am: 8e47293ec8 am: ↵Jasraj Bedi
0c7742cfa9 -s ours am: 18b974f125 -s ours am: 918b997bb8 am: f403760140 -s ours am: 6bb2d4e3a4 am: 8552eb33aa Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437458 Change-Id: I6f55fca830eacbf65f7eef7a907efde55a9ad610
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: e384a934c4 am: 8e47293ec8 am: ↵android-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-releaseJasraj Bedi
0c7742cfa9 -s ours am: 18b974f125 -s ours am: 918b997bb8 am: f403760140 -s ours am: 6bb2d4e3a4 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437458 Change-Id: I28d88cb91edf8f6cc4c226302950e0b7f8d06349
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: e384a934c4 am: 8e47293ec8 am: ↵Jasraj Bedi
0c7742cfa9 -s ours am: 18b974f125 -s ours am: 918b997bb8 am: f403760140 -s ours am: 6bb2d4e3a4 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437458 Change-Id: Ide77b0f7930f5f86a1470ecdb4ee0735af573e11
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: a96e0e16dd -s ours am: ↵Jasraj Bedi
69bb103fc2 am: 2ee159ec28 -s ours am: bdc8e1f0bf am: 5299c2cad3 am: 7aa2e43687 am: af85016610 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437455 Change-Id: I62405bcddfb95ae67616760bf050e920fb8f6006
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: ad51716489 am: 214ca45b79 -s ↵Jasraj Bedi
ours am: 8e19bde489 am: 18266b68ce am: ff029aef6f am: 14dadec76e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437132 Change-Id: I4ce92a316350b8c00c06e5cb0ec9898c5ac82710
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: a96e0e16dd -s ours am: ↵Jasraj Bedi
69bb103fc2 am: 2ee159ec28 -s ours am: bdc8e1f0bf am: 5299c2cad3 am: 83b2d55e82 am: f519c52937 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437455 Change-Id: I7d60d786d1245468220dbd87f9ef2d282d72309d
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: ad51716489 am: 214ca45b79 -s ↵Jasraj Bedi
ours am: 8e19bde489 am: 18266b68ce am: e79be42347 am: d6801d04ab -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437132 Change-Id: I3e920bef4e7efd5a090f064933440b9aec2fc182
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: e384a934c4 am: 8e47293ec8 am: ↵Jasraj Bedi
0c7742cfa9 -s ours am: 18b974f125 -s ours am: 918b997bb8 am: f403760140 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437458 Change-Id: I53753f8964e71c61411249cfd83685a59554d284
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: a96e0e16dd -s ours am: ↵Jasraj Bedi
69bb103fc2 am: 2ee159ec28 -s ours am: bdc8e1f0bf am: 5299c2cad3 am: 7aa2e43687 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437455 Change-Id: I579df0be44724785d8d9562e9bfe1f637b7788ed
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: e384a934c4 am: 8e47293ec8 am: ↵Jasraj Bedi
0c7742cfa9 -s ours am: 18b974f125 -s ours am: 918b997bb8 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437458 Change-Id: Idbe5f1d9de7fa7e944059f0399d6d072bbd5739c
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: ad51716489 am: 214ca45b79 -s ↵Jasraj Bedi
ours am: 8e19bde489 am: 18266b68ce am: ff029aef6f Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437132 Change-Id: Ifce3e23578444fa05bbf90ebac5bf79bcafc16b0
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: a96e0e16dd -s ours am: ↵Jasraj Bedi
69bb103fc2 am: 2ee159ec28 -s ours am: bdc8e1f0bf am: 5299c2cad3 am: 83b2d55e82 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437455 Change-Id: Ic70a9027f11718515ee87fcbb3fe4d4256ba75bf
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: ad51716489 am: 214ca45b79 -s ↵Jasraj Bedi
ours am: 8e19bde489 am: 18266b68ce am: e79be42347 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437132 Change-Id: I376a14d26344d2be3084bed3f9e4d4cabaa08b2e
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: 28ba37956b am: d5644c12aa am: ↵Jasraj Bedi
c62df6cc34 am: 99eee011bd -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437457 Change-Id: Ie8aa071dcffb3fe0328ae5d7ecc0abd759e382b1
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: e384a934c4 am: 8e47293ec8 am: ↵Jasraj Bedi
0c7742cfa9 -s ours am: 18b974f125 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437458 Change-Id: I4543b90c9e87134a7575af5c2951e252f66293d7
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: 28ba37956b am: d5644c12aa am: ↵Jasraj Bedi
1020e541a3 am: 4645b5d57e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437457 Change-Id: Ieae5f63a88ef2da00f795d1b360de899e3ac4649
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: a96e0e16dd -s ours am: ↵Jasraj Bedi
69bb103fc2 am: 2ee159ec28 -s ours am: bdc8e1f0bf am: 5299c2cad3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437455 Change-Id: I43c8d07eff9d6a77033ad83419529258d7073d7f
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: a96e0e16dd -s ours am: ↵Jasraj Bedi
69bb103fc2 am: 2ee159ec28 -s ours am: bdc8e1f0bf am: 3b28a574ed -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437455 Change-Id: Ia93863e2d668917085e047a4f6380343b75ef5e0
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: ad51716489 am: 214ca45b79 -s ↵Jasraj Bedi
ours am: 8e19bde489 am: 18266b68ce Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437132 Change-Id: If2377f7ade7698dec089e690686c4fcfe8a89ac9
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: a96e0e16dd -s ours am: ↵Jasraj Bedi
69bb103fc2 am: 2ee159ec28 -s ours am: bdc8e1f0bf am: 5299c2cad3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437455 Change-Id: I9946e82f70c876971affdd3e5da47dc2512c506b
2020-11-05[automerger skipped] RESTRICT AUTOMERGE am: ad51716489 am: 214ca45b79 -s ↵Jasraj Bedi
ours am: 8e19bde489 am: a1a473b9bc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gptfdisk/+/12437132 Change-Id: I2a94d331025491f95678c0dccabb0637eb32b5da
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 18:40:58 +0000