aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-16Merge "Update TEST_MAPPING" am: 6cf86ac492 am: 61c3c1e19c am: 44208f7beet_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_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_r32aml_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-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/2004809 Change-Id: Ie16386ceb0e8596b3b086bb8a0a7050ff123638c
2022-03-16Merge "Update TEST_MAPPING" am: 6cf86ac492 am: 61c3c1e19cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/2004809 Change-Id: If25989778ebb48f72e4250a34b6cb5e5ee618d0a
2022-03-15Merge "Update TEST_MAPPING" am: 6cf86ac492Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/2004809 Change-Id: I517451d8647e79dafb8f7cb87a03e5a34d629fe9
2022-03-15Merge "Update TEST_MAPPING"Treehugger Robot
2022-03-08Update TEST_MAPPINGDavid LeGare
Test: cd external/rust/crates && atest --host -c Change-Id: I8052e149b377e5ca209eb7da9dbfc64f157dab48
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a1e3f6be2b ↵Joel Galenson
am: 3fa844343f am: 911abbec54 am: 9aa302e021 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1912853 Change-Id: I6aa7a112eff9405e452c1f9db9504599fffdce4c
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a1e3f6be2b ↵Joel Galenson
am: 3fa844343f am: 911abbec54 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1912853 Change-Id: I01c3d957beac10a164c9d09ecfc17ad0a9507962
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a1e3f6be2b ↵Joel Galenson
am: 3fa844343f Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1912853 Change-Id: I59f83cf29ff62fdc9466c3f54a8db94fa8df0d07
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a1e3f6be2bJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1912853 Change-Id: I41e2a4e0b5d2d4f2bcf18b2605443722ffc203fa
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: Ifc9a17fc04504e33a3b2de6c36766b9c66de41eb
2021-10-19Enable tests am: 9c82f72e3a am: 15aab444ce am: efc89e5db2 am: 9bd9c51863 am: ↵Jeff Vander Stoep
6a9b6f8039 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1862860 Change-Id: I147dfe4cc71ab17426bd4089ffcb8c5776764683
2021-10-19Enable tests am: 9c82f72e3a am: 15aab444ce am: efc89e5db2 am: 9bd9c51863Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1862860 Change-Id: I0c8bc8a681343062a52923a1917a7906c6b41149
2021-10-19Enable tests am: 9c82f72e3a am: 15aab444ce am: efc89e5db2Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1862860 Change-Id: I10552260e89b9ca1e31da2e2942e01e0cd9bd1c1
2021-10-19Enable tests am: 9c82f72e3a am: 15aab444ceJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1862860 Change-Id: I254aa7a70891ce7df7ae566ae52638d8051c0974
2021-10-19Enable tests am: 9c82f72e3aJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1862860 Change-Id: I6fc9d474d9dafcc69e515faf8d7d29911a801d0a
2021-10-19Enable testsandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Jeff Vander Stoep
Test: atest ------- x86_64 termcolor_host_test_src_lib: Passed: 13, Failed: 0, Ignored: 0, Assumption Failed: 0, x86 termcolor_device_test_src_lib: Passed: 13, Failed: 0, Ignored: 0, Assumption Failed: 0, Change-Id: Ia8698b0f93e75c38d6fe0fd4d64f68a543521ff5
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Iabd067adc2e259acec81b098a71e4e2b824b8859
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d2ef9b12ab -s ↵Xin Li
ours am: 029dd50d83 -s ours am: ea0e4d6e63 -s ours am skip reason: Change-Id I6040dc4413f74f5bad1b8cc8352b8a15ae1d8636 with SHA-1 a2db67b664 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id4cb990dabf0966a853e2fec49d097e32538b521
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d2ef9b12ab -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r97android-mainline-12.0.0_r96android-mainline-12.0.0_r95android-mainline-12.0.0_r94android-mainline-12.0.0_r93android-mainline-12.0.0_r92android-mainline-12.0.0_r91android-mainline-12.0.0_r90android-mainline-12.0.0_r9android-mainline-12.0.0_r89android-mainline-12.0.0_r88android-mainline-12.0.0_r87android-mainline-12.0.0_r86android-mainline-12.0.0_r85android-mainline-12.0.0_r84android-mainline-12.0.0_r83android-mainline-12.0.0_r82android-mainline-12.0.0_r81android-mainline-12.0.0_r80android-mainline-12.0.0_r8android-mainline-12.0.0_r79android-mainline-12.0.0_r78android-mainline-12.0.0_r77android-mainline-12.0.0_r76android-mainline-12.0.0_r75android-mainline-12.0.0_r74android-mainline-12.0.0_r73android-mainline-12.0.0_r72android-mainline-12.0.0_r71android-mainline-12.0.0_r70android-mainline-12.0.0_r7android-mainline-12.0.0_r69android-mainline-12.0.0_r68android-mainline-12.0.0_r67android-mainline-12.0.0_r66android-mainline-12.0.0_r65android-mainline-12.0.0_r64android-mainline-12.0.0_r63android-mainline-12.0.0_r62android-mainline-12.0.0_r61android-mainline-12.0.0_r60android-mainline-12.0.0_r6android-mainline-12.0.0_r59android-mainline-12.0.0_r58android-mainline-12.0.0_r57android-mainline-12.0.0_r56android-mainline-12.0.0_r53android-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_r126android-mainline-12.0.0_r125android-mainline-12.0.0_r124android-mainline-12.0.0_r123android-mainline-12.0.0_r122android-mainline-12.0.0_r121android-mainline-12.0.0_r120android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r118android-mainline-12.0.0_r117android-mainline-12.0.0_r116android-mainline-12.0.0_r115android-mainline-12.0.0_r114android-mainline-12.0.0_r113android-mainline-12.0.0_r110android-mainline-12.0.0_r11android-mainline-12.0.0_r109android-mainline-12.0.0_r108android-mainline-12.0.0_r107android-mainline-12.0.0_r106android-mainline-12.0.0_r105android-mainline-12.0.0_r104android-mainline-12.0.0_r103android-mainline-12.0.0_r102android-mainline-12.0.0_r101android-mainline-12.0.0_r100android-mainline-12.0.0_r10android-mainline-12.0.0_r1aml_wif_311811030aml_tz3_311312010aml_tet_311811050aml_sdk_311710000aml_pco_311011000aml_mpr_311911090aml_doc_310851020android12-mainline-wifi-releaseandroid12-mainline-tethering-releaseandroid12-mainline-statsd-releaseandroid12-mainline-sdkext-releaseandroid12-mainline-resolv-releaseandroid12-mainline-permission-releaseandroid12-mainline-neuralnetworks-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-mediaprovider-releaseandroid12-mainline-media-swcodec-releaseandroid12-mainline-media-releaseandroid12-mainline-ipsec-releaseandroid12-mainline-extservices-releaseandroid12-mainline-documentsui-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-cellbroadcast-releaseandroid12-mainline-captiveportallogin-releaseandroid12-mainline-art-releaseandroid12-mainline-adbd-releaseXin Li
ours am: 029dd50d83 -s ours am: ea0e4d6e63 -s ours am skip reason: Change-Id I6040dc4413f74f5bad1b8cc8352b8a15ae1d8636 with SHA-1 a2db67b664 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I09a552720a08f387b2684dfc2308f3eea3cb0e75
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d2ef9b12ab -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: 029dd50d83 -s ours am skip reason: Change-Id I6040dc4413f74f5bad1b8cc8352b8a15ae1d8636 with SHA-1 a2db67b664 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I62c11c6af3493d1170ec9110e2d9a72a490485d5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d2ef9b12ab -s oursXin Li
am skip reason: Change-Id I6040dc4413f74f5bad1b8cc8352b8a15ae1d8636 with SHA-1 a2db67b664 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I90d83bf24eb189d28cd9e22846f7b5b67998cb76
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I6040dc4413f74f5bad1b8cc8352b8a15ae1d8636 Change-Id: I506508694b63c46ba8762409d2b2933f0af0aca7
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/termcolor am: ↵Bob Badour
b065968da0 am: 08d5b051cf am: c2291b1ab8 am: 4716316d08 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1588751 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2543803c38ab6b25c616eca3ce60c12df4d532fc
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/termcolor am: ↵Bob Badour
b065968da0 am: 08d5b051cf am: c2291b1ab8 am: 4716316d08 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1588751 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib0ee2d99a066fd604e758220609cbe2fcf8ba284
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/termcolor am: ↵Bob Badour
b065968da0 am: 08d5b051cf am: c2291b1ab8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1588751 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2362301c3ab8d09458d69dcaab769540572d51c3
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/termcolor am: ↵Bob Badour
b065968da0 am: 08d5b051cf Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1588751 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I59fd8744aa435d7c6771f54da5b52b4a8a7a9877
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/termcolor am: b065968da0Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1588751 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifa7b4847878f0f6e3144a4ff8f711665942202c3
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/termcolorandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-MIT SPDX-license-identifier-Unlicense to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Iead3be3c8ff1d58e508193417014806cade3e132
2020-11-25Mark ab/6881855 as merged am: 2ae2995054 am: a2db67b664Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/13111231 Change-Id: Ib57377afbde53f0fc63039dc01e5d86302e7e5f2
2020-11-25Mark ab/6881855 as merged am: 2ae2995054Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/13111231 Change-Id: I6040dc4413f74f5bad1b8cc8352b8a15ae1d8636
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I5e7540e8d990cf33c3d1dd68291e23d954dd7184
2020-11-23Upgrade rust/crates/termcolor to 1.1.2 am: 3128b854ea am: ce1a0d1d89 am: ↵Haibo Huang
050af3191e Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1505811 Change-Id: If9224032263f20345855bd273e0ae6a14a1fcfff
2020-11-23Upgrade rust/crates/termcolor to 1.1.2 am: 3128b854ea am: ce1a0d1d89Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1505811 Change-Id: I18a5abc9eecca7ff4d05fd35e1ffa1990f91d43e
2020-11-23Upgrade rust/crates/termcolor to 1.1.2 am: 3128b854eaHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1505811 Change-Id: I6a72192048d9a38c5db31847822697937f738e3a
2020-11-19Upgrade rust/crates/termcolor to 1.1.2Haibo Huang
Test: make Change-Id: Ied6674c9b818beb26ffc8b6cbbe705da89f1ec2c
2020-10-12[automerger skipped] Skip ab/6749736 in stage. am: bc625adc38 -s ours am: ↵Xin Li
fc6ee677de -s ours am: 7f8338dd63 -s ours am skip reason: Change-Id Ic98b736d0bb0fe163baed5ecff9e423423955c28 with SHA-1 9ac737138f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/12797263 Change-Id: I866de48632f8b44943d59f3bd8f83b8656ef7a51
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: bc625adc38 -s ours am: ↵Xin Li
fc6ee677de -s ours am skip reason: Change-Id Ic98b736d0bb0fe163baed5ecff9e423423955c28 with SHA-1 9ac737138f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/12797263 Change-Id: I10443fe09a09fa59dd20605a9843b8339123dddc
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: bc625adc38 -s oursXin Li
am skip reason: Change-Id Ic98b736d0bb0fe163baed5ecff9e423423955c28 with SHA-1 9ac737138f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/12797263 Change-Id: Id95c97b75c74dc5c7f186f1ba4585200fec7493e
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ic98b736d0bb0fe163baed5ecff9e423423955c28 Change-Id: Ia1b7cd737ab7dff25095f01aa1f02f70fc7759c7
2020-08-28Fix termcolor/METADATA am: 6074575811 am: fac79ae367 am: 33da30f336 am: ↵Chih-Hung Hsieh
fd8d40ec93 am: ea105a6d89 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1414095 Change-Id: I492d1bdd2fe1280b078a18865077ca49e9f1359a
2020-08-27Fix termcolor/METADATA am: 6074575811 am: fac79ae367 am: 33da30f336 am: ↵Chih-Hung Hsieh
fd8d40ec93 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1414095 Change-Id: I03a06c284603a7603215b208b2fb877d2327a9b5
2020-08-27Fix termcolor/METADATA am: 6074575811 am: fac79ae367 am: 33da30f336Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1414095 Change-Id: I1dcfee12378a4b971ed49470ebd9fee451a434d1
2020-08-27Fix termcolor/METADATA am: 6074575811 am: fac79ae367Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1414095 Change-Id: I163de2866494b756290ae350cd3f543a30b76cb6
2020-08-27Fix termcolor/METADATA am: 6074575811Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1414095 Change-Id: Ieb84ca434fb0b829d6630540b3e702b6549d8870
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 0f3ea28532 -s ours am: 5ae3ece633 -s ours am: 014a53f7fb -s ours am: 26fc05e04e -s ours am skip reason: Change-Id I4171de3799d96380a1c66b698f09eead1d9000ab with SHA-1 a4acb01ee9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/12469398 Change-Id: Ia0de76cde755c0994f91e21b1a0d6d344283b984
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 0f3ea28532 -s ours am: 5ae3ece633 -s ours am: 014a53f7fb -s ours am skip reason: Change-Id I4171de3799d96380a1c66b698f09eead1d9000ab with SHA-1 a4acb01ee9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/12469398 Change-Id: I0f809d2679d4781da97aee172455562848b92269
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 0f3ea28532 -s ours am: 5ae3ece633 -s ours am skip reason: Change-Id I4171de3799d96380a1c66b698f09eead1d9000ab with SHA-1 a4acb01ee9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/12469398 Change-Id: I0383c174300c410cd5fdaf54d9da157f555bbf5d
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 0f3ea28532 -s ours am skip reason: Change-Id I4171de3799d96380a1c66b698f09eead1d9000ab with SHA-1 a4acb01ee9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/12469398 Change-Id: I51dd0978b7dd0ffb7ebb0b1aea3923d8cc3ee868
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I4171de3799d96380a1c66b698f09eead1d9000ab Change-Id: I15d6fe2389f1daeb355f540865a99b795501d17b