aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-16Snap for 8736029 from a8f58b3dc7a2e80fba1075281dc94192322f5771 to ↵aml_go_sdk_330810000android13-mainline-go-sdkext-releaseAndroid Build Coastguard Worker
mainline-go-sdkext-release Change-Id: Idf834726ec515f0864539bff47727ce40c6b6aa7
2022-03-04Move comment to license_note am: 826c6cb17c am: 44eaa1cd00 am: 650e398414 ↵aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010Bob Badour
am: 1ad861b9aa Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/2008359 Change-Id: Ica75c4d4eb935584f8aae30fdfd2c0c5290a0dff
2022-03-04Move comment to license_note am: 826c6cb17c am: 44eaa1cd00 am: 650e398414t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/2008359 Change-Id: I200720e8f84dc370fa1dc4dbec8cbe0082ad3d22
2022-03-04Move comment to license_note am: 826c6cb17c am: 44eaa1cd00Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/2008359 Change-Id: I6dc12e7e8e94cba0a177413d40c4d271bc281823
2022-03-04Move comment to license_note am: 826c6cb17cBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/2008359 Change-Id: I328d7c42e410ae7945473d658ff175c5608772b7
2022-03-03Move comment to license_noteBob Badour
Comments not preserved during refresh. Test: m nothing Change-Id: I31bd985d87e9db10c3a49eeb057516d0cbd7b178
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 920c08720e -s ours am: 8fa918405f -s ours am skip reason: Merged-In I858aedceffe03026158158acfed5b52fc5f28547 with SHA-1 fd84518fae is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/16843592 Change-Id: I372ba4459c84a590bdb6310134fa3b895fcff17f
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 920c08720e -s ours am skip reason: Merged-In I858aedceffe03026158158acfed5b52fc5f28547 with SHA-1 fd84518fae is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/16843592 Change-Id: I76342db2f9906da2a9161c152b08cb3dc69f460e
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I858aedceffe03026158158acfed5b52fc5f28547 Change-Id: I49263bf1f3a12b232f0607600aba22b383a429c9
2022-02-02libz has to be a shared library as the apex complains that it cannot be am: ↵Roopa Sattiraju
2ca8ec0dff am: a365cb9dd6 am: 7c2b657b58 am: 8fbea1b09b Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1967165 Change-Id: I717312156d030cc54e5edb7da527f78201de91df
2022-02-02libz has to be a shared library as the apex complains that it cannot be am: ↵Roopa Sattiraju
2ca8ec0dff am: a365cb9dd6 am: 7c2b657b58 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1967165 Change-Id: I94c6d16be08ffabfb31de5b3f5b78c3dbd2c9ee6
2022-02-02libz has to be a shared library as the apex complains that it cannot be am: ↵Roopa Sattiraju
2ca8ec0dff am: a365cb9dd6 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1967165 Change-Id: I6b5023ca7135ea65b9240b460ae5bc71a0a04a14
2022-02-02libz has to be a shared library as the apex complains that it cannot be am: ↵Roopa Sattiraju
2ca8ec0dff Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1967165 Change-Id: If49e550e518fa14c9897328b9999f8a05661cb8d
2022-02-01libz has to be a shared library as the apex complains that it cannot beandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Roopa Sattiraju
statically linked. Bug: 206121418 Test: Compile Change-Id: I32dfc24978ea64c20db60d841aea9e0ccaacedb0
2021-12-29Adding libc++ and bt apex availablity to libs in grpc am: fd84518fae am: ↵Roopa Sattiraju
843de4eac4 am: d5329daec2 am: 2ca1e63232 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1932238 Change-Id: I296f8243f28c1658deb6cde9cb3dc9a92dda99b2
2021-12-29Adding libc++ and bt apex availablity to libs in grpc am: fd84518fae am: ↵Roopa Sattiraju
843de4eac4 am: d5329daec2 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1932238 Change-Id: I57f29a82ea2af7660c6eeb3b878f0fc66a5775a0
2021-12-29Adding libc++ and bt apex availablity to libs in grpc am: fd84518fae am: ↵Roopa Sattiraju
843de4eac4 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1932238 Change-Id: I0dd2757e4b3bdc7a2137d01a56aa488237b704de
2021-12-29Adding libc++ and bt apex availablity to libs in grpc am: fd84518faeRoopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1932238 Change-Id: Ia67bf065dccf166be63eeae9ece40a26c0523868
2021-12-23Adding libc++ and bt apex availablity to libs in grpcRoopa Sattiraju
Bug: 206121418 Test: Compile Change-Id: I858aedceffe03026158158acfed5b52fc5f28547
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I8cd5ed5da78b2d9252b05387ea978908ffe9baa7
2021-03-25alarm_test already runs in presubmit am: 670b0afded am: 3fa0f2b872 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-releaseJulien Desprez
97943f63ee am: 625237135f Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1653127 Change-Id: I5ce7f73167bdf88b777b6dd3f7e1871cc88eeaf9
2021-03-25alarm_test already runs in presubmit am: 670b0afded am: 3fa0f2b872 am: ↵Julien Desprez
97943f63ee am: 625237135f Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1653127 Change-Id: I4b14698ef3ae6303ab322b310ba319a8f1b94106
2021-03-25alarm_test already runs in presubmit am: 670b0afded am: 3fa0f2b872 am: ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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-devandroid-s-v2-preview-1Julien Desprez
97943f63ee Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1653127 Change-Id: I1027cae43e57252632e1da9e538ebd775216bcff
2021-03-25alarm_test already runs in presubmit am: 670b0afded am: 3fa0f2b872Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1653127 Change-Id: Iaa572b466ff7b526e13b9e68d199416a92c2693b
2021-03-25alarm_test already runs in presubmit am: 670b0afdedandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1653127 Change-Id: I86dbb3626c24398d4753b2744318a7009a3bad53
2021-03-24alarm_test already runs in presubmitandroid-s-beta-2android-s-beta-1Julien Desprez
alarm_test is already part of host-unit-tests presubmit, no need to be define for test mapping postsubmit Change-Id: I5e96328cd94bb8eb8132851f5105eac963a69390 Test: presubmit Bug: 183622274
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e16e89e127 -s ↵Xin Li
ours am: 61cbc7e0fa -s ours am: c76f443a68 -s ours am skip reason: Change-Id I1436c5cc1f1bb9e57af1702cc3421e20ff962ad5 with SHA-1 b8a1eb3828 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id90eb60b660361f8701487454518df8d1fe03a69
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e16e89e127 -s ↵Xin Li
ours am: 61cbc7e0fa -s ours am: c76f443a68 -s ours am skip reason: Change-Id I1436c5cc1f1bb9e57af1702cc3421e20ff962ad5 with SHA-1 b8a1eb3828 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id3e37e351f8bbab38c67ddfe275a6274121a21d8
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e16e89e127 -s ↵Xin Li
ours am: 61cbc7e0fa -s ours am skip reason: Change-Id I1436c5cc1f1bb9e57af1702cc3421e20ff962ad5 with SHA-1 b8a1eb3828 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie98b3d8a775fa63a339157b022b8655e899c8ccc
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e16e89e127 -s oursXin Li
am skip reason: Change-Id I1436c5cc1f1bb9e57af1702cc3421e20ff962ad5 with SHA-1 b8a1eb3828 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I41d03245e0cf705e26fc7b66f009114fa82515ef
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I1436c5cc1f1bb9e57af1702cc3421e20ff962ad5 Change-Id: I656f59448ea21dd3a3cc86a6f3d7ab263288ba23
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpc am: caf1c07960 am: ↵Bob Badour
7758608f66 am: 31ea9a7237 am: d2d109b269 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1588888 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I54f631cd1d5eaace4959119ae28b3f6d7f7ab52b
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpc am: caf1c07960 am: ↵Bob Badour
7758608f66 am: 31ea9a7237 am: d2d109b269 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1588888 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I63389417e7217fd50c92ccbd3da8675ec895c0b1
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpc am: caf1c07960 am: ↵Bob Badour
7758608f66 am: 31ea9a7237 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1588888 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I06b5b4128b30af2a719117f06eafe909804053b7
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpc am: caf1c07960 am: ↵Bob Badour
7758608f66 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1588888 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic577dd784fe04488ddebe13ba120e85e022da5ed
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpc am: caf1c07960Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1588888 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I33862a8c787499e7b1be297ee050760270454c8a
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpcandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: test/core/util/Android.bp test/cpp/common/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-ISC SPDX-license-identifier-MIT SPDX-license-identifier-MPL-2.0 SPDX-license-identifier-Zlib legacy_unencumbered to: Android.bp Added SPDX-license-identifier-BSD to: third_party/address_sorting/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I5412696bd8aa63438e034a7e4664255c61e289d7
2021-02-01Fix license_type. Contains MPL in certificate source am: bce9627e21 am: ↵Bob Badour
b750f56c47 am: 6d570f331f am: 428e163032 am: cb54dfe44d Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1565174 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib4edb050a4edf89d313e2ae2af70e710b5e7c4de
2021-02-01Fix license_type. Contains MPL in certificate source am: bce9627e21 am: ↵Bob Badour
b750f56c47 am: 6d570f331f am: 428e163032 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1565174 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idbb7364f2325bd534a604cff32e09b6bb5367a52
2021-02-01Fix license_type. Contains MPL in certificate source am: bce9627e21 am: ↵Bob Badour
b750f56c47 am: 6d570f331f am: 428e163032 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1565174 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I39729d7232ef9a42133d1967a162c84bcbc868d9
2021-02-01Fix license_type. Contains MPL in certificate source am: bce9627e21 am: ↵Bob Badour
b750f56c47 am: 6d570f331f Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1565174 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifbe9c24554caf4a75d73214a3e42dd390009656f
2021-02-01Fix license_type. Contains MPL in certificate source am: bce9627e21 am: ↵Bob Badour
b750f56c47 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1565174 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia7f7b80fa04eeaa8d66c4b62663b46b57d2ecb4b
2021-02-01Fix license_type. Contains MPL in certificate source am: bce9627e21Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1565174 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ca154cbabcdc6b35a73c889c2c5b4da98942a0e
2021-01-28Fix license_type. Contains MPL in certificate sourceBob Badour
See: http://go/android-license-checking-v2-lsc https://android.googlesource.com/platform/external/grpc-grpc/+/master/etc/roots.pem https://android.googlesource.com/platform/external/grpc-grpc/+/master/src/android/test/interop/app/src/main/assets/roots.pem Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: Icfea2c086763ada93bf987980204776bb2e4f953
2020-11-24Mark ab/6881855 as merged am: 9005cccbf7 am: b8a1eb3828Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/13110515 Change-Id: I2d8de4e1d9a49bf1ee441aecc8a690175f51d30f
2020-11-24Mark ab/6881855 as merged am: 9005cccbf7Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/13110515 Change-Id: I1436c5cc1f1bb9e57af1702cc3421e20ff962ad5
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I5771870298a4f9bdb8d0a4089240cba0f1dd6be4
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3f5c23c499 -s ours am: ↵Xin Li
ec69d49c2d -s ours am: 2e8c2bb1e8 -s ours am skip reason: Change-Id Idb0a057efdf0f9358c31db1983344cc88e82d2ff with SHA-1 516f31dd01 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/12796085 Change-Id: I582667086593895302e21360c5816c1f6c59a173
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3f5c23c499 -s ours am: ↵Xin Li
ec69d49c2d -s ours am skip reason: Change-Id Idb0a057efdf0f9358c31db1983344cc88e82d2ff with SHA-1 516f31dd01 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/12796085 Change-Id: Icb70e081202744995f02a13d9fc712858c07ba26
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3f5c23c499 -s oursXin Li
am skip reason: Change-Id Idb0a057efdf0f9358c31db1983344cc88e82d2ff with SHA-1 516f31dd01 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/12796085 Change-Id: I5ffb7c2d12a6b86cc73f2283962284e0311d5a0e