aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-16Snap for 8310876 from 5b564901faf2923d0f10735d4ee024687b611602 to ↵aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-mainline-adservices-releaseAndroid Build Coastguard Worker
mainline-adservices-release Change-Id: If260e47a5ff70afb92399566fb95e55ac4aaaadd
2022-03-05Update tokio-macros to 1.7.0 am: 2201091026 am: 56d771eb4d am: c42907f442 ↵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_332714010David LeGare
am: 8ee724d26a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2004875 Change-Id: I8296d64e0945d51cd4d7c1a2520ded6fcaf620d9
2022-03-04Update tokio-macros to 1.7.0 am: 2201091026 am: 56d771eb4d am: c42907f442t_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-releaseDavid LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2004875 Change-Id: Ia232104f938a05abeaa1b34f39aafc92ecacc8d0
2022-03-04Update tokio-macros to 1.7.0 am: 2201091026 am: 56d771eb4dDavid LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2004875 Change-Id: Id1fa0b0afdbc4b493293de896282ca7b9d9db693
2022-03-04Update tokio-macros to 1.7.0 am: 2201091026David LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2004875 Change-Id: I9ad245dbd6fb6ce66bf84679e93859211e18587a
2022-03-02Update tokio-macros to 1.7.0David LeGare
Test: cd external/rust/crates && atest --host -c Change-Id: Ie7b2111110b0ac8353eb380144c64e578d42d4e7
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 20d7bce817 ↵Joel Galenson
am: deafa1d498 am: a6afd5ba40 am: ed03940b7c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1912417 Change-Id: I71628b50a8ee70e673694d372cb5b0ad62ecbfe4
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 20d7bce817 ↵Joel Galenson
am: deafa1d498 am: a6afd5ba40 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1912417 Change-Id: I49f9eba0867acb7d511fddb60cca31b0e3d51975
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 20d7bce817 ↵Joel Galenson
am: deafa1d498 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1912417 Change-Id: I8db289168e7702af1759d8785a38b1d8c18926df
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 20d7bce817Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1912417 Change-Id: I4e502f8a9b8f1cdcbad0306a82e0c42d50cfb3a8
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-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-1Joel Galenson
2021-12-10Refresh Android.bp, cargo2android.json, TEST_MAPPING.Joel Galenson
Test: None Change-Id: I377d1b4750f17e551a188fafa296a0c0f47067b0
2021-11-18[automerger skipped] DO NOT MERGE Remove newer cargo compat features am: ↵Matthew Maurer
64b8d17e47 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/16277378 Change-Id: I249107f64ee362020bc77ace1f0739d7816d9e7b
2021-11-18Merge up to 1.6.0 to get security fixes am: aae03f3ca7Matthew Maurer
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/16276797 Change-Id: I4b4ccc1722beb7c5786374fb8097f28dd829eb5d
2021-11-16DO NOT MERGE Remove newer cargo compat featuresMatthew Maurer
The modern updater tool adds two new fields to cargo imported packages. Tokio does not strictly need either, and the build system for mainline doesn't know about them yet, so they need to be removed to take the update. Test: m Bug: 206680413 Change-Id: I8566974df0008553b66e700cc194ea9b291adfe7
2021-11-16Merge up to 1.6.0 to get security fixesMatthew Maurer
Test: m Bug: 206680413 Merge remote-tracking branch 'goog/mirror-aosp-master' into HEAD Change-Id: I1943bcbf52a5c3fb20b283849d242e7f41d5d35b
2021-11-16Update to 1.6.0 am: 8fd151bbe2 am: 27a6d60a59 am: 7b7b971325 am: dd93953c41Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1892676 Change-Id: I995a6a57534ecddd301677d6c9ff7e6ab463fb59
2021-11-16Update to 1.6.0 am: 8fd151bbe2 am: 27a6d60a59 am: 7b7b971325Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1892676 Change-Id: I8781db3464cefd86a9bcf75c52b8c9d15334f29a
2021-11-16Update to 1.6.0 am: 8fd151bbe2 am: 27a6d60a59Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1892676 Change-Id: I32d6acef57a11eeb668e4713f5a6ebf38161f6a9
2021-11-16Update to 1.6.0 am: 8fd151bbe2Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1892676 Change-Id: I2c31cb309c5d896094417bbbbb151eba156d7377
2021-11-16Update to 1.6.0Jeff Vander Stoep
Test: atest Change-Id: Iffed8e417e0f53d281f6bc294d434c341e0af9fa
2021-10-08Merge "Upgrade rust/crates/tokio-macros to 1.4.1" am: b0c1c33f39 am: ↵Joel Galenson
1bd67db7da am: cb53010bcd am: 365a5f325e am: 974814cd08 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1842075 Change-Id: I514ea573614dde334fdbc45b853b0ccc3eb8c2c9
2021-10-08Merge "Upgrade rust/crates/tokio-macros to 1.4.1" am: b0c1c33f39 am: ↵Joel Galenson
1bd67db7da am: cb53010bcd am: 365a5f325e Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1842075 Change-Id: Ib76e2935eb2b89652fff7a51dbe8607d04bff61f
2021-10-08Merge "Upgrade rust/crates/tokio-macros to 1.4.1" am: b0c1c33f39 am: ↵Joel Galenson
1bd67db7da am: cb53010bcd Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1842075 Change-Id: I0deef3882a79339751ed80f8a507ab7f5e9a3cb3
2021-10-08Merge "Upgrade rust/crates/tokio-macros to 1.4.1" am: b0c1c33f39 am: 1bd67db7daJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1842075 Change-Id: I7b88fcda1a6e6a7fb30bfeb5551f613a7845b802
2021-10-08Merge "Upgrade rust/crates/tokio-macros to 1.4.1" am: b0c1c33f39Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1842075 Change-Id: I4a0014cae30d2e8c03188a265ad5239b3090d3da
2021-10-08Merge "Upgrade rust/crates/tokio-macros to 1.4.1"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Joel Galenson
2021-09-30Upgrade rust/crates/tokio-macros to 1.4.1Joel Galenson
Test: make Change-Id: Ifa7309a0a76e2e73beec1115007d3c737adb21e2
2021-08-24Update TEST_MAPPING am: aa5f147548 am: 6f3a103939 am: e0caa0cdd5 am: ↵Joel Galenson
db1f6e1e4e am: e82f60fee6 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1805839 Change-Id: Ia4814a5f3957f90a6d006b3e3ac6cf8055e63ed3
2021-08-24Update TEST_MAPPING am: aa5f147548 am: 6f3a103939 am: e0caa0cdd5 am: db1f6e1e4eJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1805839 Change-Id: I1ed1b2c41b6760588fc8b7e5f053d7c0bc5d84a9
2021-08-24Update TEST_MAPPING am: aa5f147548 am: 6f3a103939 am: e0caa0cdd5Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1805839 Change-Id: Ib74e623811609870cac98f411feb0c2f061883ac
2021-08-24Update TEST_MAPPING am: aa5f147548 am: 6f3a103939Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1805839 Change-Id: I4e6056bd7a8410497855df4daa1414ea80b821dd
2021-08-24Update TEST_MAPPING am: aa5f147548Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1805839 Change-Id: I6040925f7e26c580b0a639f10a6acb8ba9fef061
2021-08-23Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: I9197ab8a2e6f304d3d36cf93155f6456991dfef6
2021-08-11Upgrade rust/crates/tokio-macros to 1.3.0 am: b92cb37d81 am: 9807332c20 am: ↵Joel Galenson
ce666e5a9f am: 60375c525a am: 180719c615 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1791042 Change-Id: I7e051b624b907fce91aa29086b0db45bc6c1dac5
2021-08-11Upgrade rust/crates/tokio-macros to 1.3.0 am: b92cb37d81 am: 9807332c20 am: ↵Joel Galenson
ce666e5a9f am: 60375c525a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1791042 Change-Id: I6924ea10ca4360de312b77ab58e93a5022596154
2021-08-11Upgrade rust/crates/tokio-macros to 1.3.0 am: b92cb37d81 am: 9807332c20 am: ↵Joel Galenson
ce666e5a9f Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1791042 Change-Id: Ie9d094a35d6d4e2190017df168278c2404ba4c34
2021-08-11Upgrade rust/crates/tokio-macros to 1.3.0 am: b92cb37d81 am: 9807332c20Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1791042 Change-Id: I52aa91e36f81ad7431660c84b07e0408e438457b
2021-08-11Upgrade rust/crates/tokio-macros to 1.3.0 am: b92cb37d81Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1791042 Change-Id: If1c3397b77543a1b886a93ba6ec7b0b53dd7612b
2021-08-09Upgrade rust/crates/tokio-macros to 1.3.0Joel Galenson
Test: make Change-Id: I22fbe1e3105b460bb7bc127f8b4fe94cdacc484d
2021-06-09Upgrade rust/crates/tokio-macros to 1.2.0 am: 40177b3a2a am: 8d280d0b1b am: ↵Joel Galenson
983f6cf60e am: 83bab2068d Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1712792 Change-Id: Iab1b0a3f7dabdab540e2b4c85fe70993c962a510
2021-06-09Upgrade rust/crates/tokio-macros to 1.2.0 am: 40177b3a2a am: 8d280d0b1b am: ↵Joel Galenson
983f6cf60e Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1712792 Change-Id: I822499fbecc5bbfc2c1e56a677a567a5ed6b26fa
2021-06-09Upgrade rust/crates/tokio-macros to 1.2.0 am: 40177b3a2a am: 8d280d0b1bJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1712792 Change-Id: Ibd5799f51b7469be787e3f89dc7661b6fc52a4a7
2021-06-09Upgrade rust/crates/tokio-macros to 1.2.0 am: 40177b3a2aandroid-s-beta-4android-s-beta-3android-s-beta-4Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1712792 Change-Id: I2f948f926398ea4625fcc6d8d7c34a9cb67d185b
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I01f87a94a677a02a257d48fd2264be0b0f74a76d
2021-05-19Upgrade rust/crates/tokio-macros to 1.2.0Joel Galenson
Test: make Change-Id: I337f3950298a816b6df5d1a778db0c91c2b90293
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6a76904f4b -s ↵android-mainline-12.0.0_r9android-mainline-12.0.0_r8android-mainline-12.0.0_r78android-mainline-12.0.0_r71android-mainline-12.0.0_r7android-mainline-12.0.0_r68android-mainline-12.0.0_r60android-mainline-12.0.0_r6android-mainline-12.0.0_r58android-mainline-12.0.0_r56android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r50android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r48android-mainline-12.0.0_r47android-mainline-12.0.0_r46android-mainline-12.0.0_r45android-mainline-12.0.0_r44android-mainline-12.0.0_r43android-mainline-12.0.0_r42android-mainline-12.0.0_r41android-mainline-12.0.0_r40android-mainline-12.0.0_r39android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r33android-mainline-12.0.0_r32android-mainline-12.0.0_r31android-mainline-12.0.0_r30android-mainline-12.0.0_r3android-mainline-12.0.0_r29android-mainline-12.0.0_r28android-mainline-12.0.0_r27android-mainline-12.0.0_r26android-mainline-12.0.0_r25android-mainline-12.0.0_r24android-mainline-12.0.0_r23android-mainline-12.0.0_r22android-mainline-12.0.0_r21android-mainline-12.0.0_r20android-mainline-12.0.0_r2android-mainline-12.0.0_r19android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r13android-mainline-12.0.0_r12android-mainline-12.0.0_r113android-mainline-12.0.0_r11android-mainline-12.0.0_r10android-mainline-12.0.0_r1aml_tz3_311312010aml_pco_311011000aml_doc_310851020android12-mainline-statsd-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-documentsui-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-captiveportallogin-releaseandroid12-mainline-art-releaseXin Li
ours am: e0f0c29594 -s ours am: 4b0cb10d52 -s ours am skip reason: Change-Id I7689e32ef22c2c738436a491b2215272e032343c with SHA-1 83002a5588 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib7450a5f624f2415deec35ae4b44e25f981d0a58
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6a76904f4b -s ↵Xin Li
ours am: e0f0c29594 -s ours am: 4b0cb10d52 -s ours am skip reason: Change-Id I7689e32ef22c2c738436a491b2215272e032343c with SHA-1 83002a5588 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6b7a2c2256918fc1368c728c9f6fddcb3c7290e0
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6a76904f4b -s ↵android-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-releaseXin Li
ours am: e0f0c29594 -s ours am skip reason: Change-Id I7689e32ef22c2c738436a491b2215272e032343c with SHA-1 83002a5588 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I166ce48c633836945d1b6a20d48404d7142988fe
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6a76904f4b -s oursXin Li
am skip reason: Change-Id I7689e32ef22c2c738436a491b2215272e032343c with SHA-1 83002a5588 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8f51a3b21c36af30bf53591ffd0ad95b62766650