summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-07Snap for 10453563 from daf14700ee0fb2554bc5ba315f61658721e6e840 to ↵aml_swc_341711000aml_swc_341619000aml_swc_341513600aml_swc_341312300aml_swc_341312020aml_swc_341111000aml_swc_341011020aml_swc_340922010android14-mainline-media-swcodec-releaseAndroid Build Coastguard Worker
mainline-media-swcodec-release Change-Id: I2b734d2e274d3b09473f4a722942d0c9e67c085c
2022-05-11Snap for 8570526 from b4e1ed6f29e5a6e2c990bf623ac046b69dc81749 to ↵aml_swc_331911000aml_swc_331712000aml_swc_331612000aml_swc_331511000aml_swc_331410000aml_swc_331318000aml_swc_331116000aml_swc_331012020android13-mainline-media-swcodec-releaseAndroid Build Coastguard Worker
mainline-media-swcodec-release Change-Id: I94c8cd2c331794d128e94740c3c66f6793c51e47
2022-03-08Add license_note am: 366bc46910 am: 824a416382 am: 834d179a60 am: 8220c0c864 ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseBob Badour
am: b4e1ed6f29 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/2011747 Change-Id: Ie842aabcd0a382dcb0bfddec4d613638c91cfcb0
2022-03-08Add license_note am: 366bc46910 am: 824a416382 am: 834d179a60 am: 8220c0c864Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/2011747 Change-Id: I297e527b54788f375fad02e5bcc91f2349ccafd7
2022-03-08Add license_note am: 366bc46910 am: 824a416382 am: 834d179a60 am: 8220c0c864aml_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-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/2011747 Change-Id: Id025bc1a196a748adda8b2bc4e12f7031bf44952
2022-03-08Add license_note am: 366bc46910 am: 824a416382 am: 834d179a60t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-u-beta-1-gplandroid-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_330913000main-16k-with-phonesmain-16kandroid13-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/google-fonts/arvo/+/2011747 Change-Id: I40a82411bd4bea409cfbf7b0da6f68f1f9620aeb
2022-03-08Add license_note am: 366bc46910 am: 824a416382Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/2011747 Change-Id: I7983b732072918ab6cdc36011901d5cdcc96170d
2022-03-08Add license_note am: 366bc46910Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/2011747 Change-Id: I8e19b45ab968f34850ee84397fcada18ab9b6d77
2022-03-07Add license_noteBob Badour
Comments not preserved during refresh. Bug: 68860345 Test: m nothing Change-Id: I1b5b8c0075334ff35ffe3ec61a479b26213cb293
2021-06-19Snap for 7474514 from 6ec2abd7ef075da4eb176badd8f31df533241212 to ↵android-mainline-12.0.0_r91android-mainline-12.0.0_r75android-mainline-12.0.0_r47android-mainline-12.0.0_r30android-mainline-12.0.0_r13android-mainline-12.0.0_r120android-mainline-12.0.0_r105android12-mainline-media-swcodec-releaseandroid-build-team Robot
mainline-media-swcodec-release Change-Id: I8a515c1a77897ee74fb965a0b8c9aba48694919a
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ic869fe2cb6f415964dc9e805e3cb27f26b96471e
2021-05-29[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arvo am: b2ff1fcb97 ↵Bob Badour
am: e715f8c956 am: 619db42d22 am: 89ebe0f341 am: 04ece859dd Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1588658 Change-Id: I684e7147e39c5d28622ea8436ce202994a610a0b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1005dcf5fb -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: 4fe65eb0fc -s ours am: be53ce0dfb -s ours am skip reason: Change-Id Ic3e57d2e660cdf3e93cc9c365f37ed706c90f9ab with SHA-1 ad83b0871f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id3f128fe9e729665fff96236e4efaa0580aab730
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1005dcf5fb -s ↵Xin Li
ours am: 4fe65eb0fc -s ours am: be53ce0dfb -s ours am skip reason: Change-Id Ic3e57d2e660cdf3e93cc9c365f37ed706c90f9ab with SHA-1 ad83b0871f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib48246dc509537c6867326fdaf75ee4cbbfcd9c9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1005dcf5fb -s ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-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-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: 4fe65eb0fc -s ours am skip reason: Change-Id Ic3e57d2e660cdf3e93cc9c365f37ed706c90f9ab with SHA-1 ad83b0871f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib8e38b4a2a7cd181aebddc17ee0ab21f8cfd0134
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1005dcf5fb -s oursXin Li
am skip reason: Change-Id Ic3e57d2e660cdf3e93cc9c365f37ed706c90f9ab with SHA-1 ad83b0871f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I47df30b7bee9db7f17da3ae139ac3a434000fbde
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: Ic3e57d2e660cdf3e93cc9c365f37ed706c90f9ab Change-Id: If8705273cc838b59ad8c11978a0aeb42aee59774
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arvo am: b2ff1fcb97 ↵Bob Badour
am: e715f8c956 am: 619db42d22 am: 89ebe0f341 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1588658 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iabe016c30db84ca49f0a3d7f9a5f7205a9e609a9
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arvo am: b2ff1fcb97 ↵Bob Badour
am: e715f8c956 am: 619db42d22 am: 89ebe0f341 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1588658 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I273dbd87511688ad07ecd3c8bcc6bd8a48603aa3
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arvo am: b2ff1fcb97 ↵Bob Badour
am: e715f8c956 am: 619db42d22 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1588658 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id0be98f84afb56542ba6f1eea633c71900abfde3
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arvo am: b2ff1fcb97 ↵Bob Badour
am: e715f8c956 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1588658 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic28b4400167eb995e138a7a6d19925753fcf21e3
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arvo am: b2ff1fcb97Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1588658 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idbc96b7b16e8a47ffd676bef8cc425340fd95f27
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arvoandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-MIT SPDX-license-identifier-OFL legacy_by_exception_only to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I855e0bb3feb22613bd72c46454aabacda8a8584d
2020-11-24Mark ab/6881855 as merged am: 1c247d3914 am: ad83b0871fXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/13109875 Change-Id: I00083f0e9fabf947a98259ba54e9bd633a58d017
2020-11-24Mark ab/6881855 as merged am: 1c247d3914Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/13109875 Change-Id: Ic3e57d2e660cdf3e93cc9c365f37ed706c90f9ab
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I65147cbdb0388475f362d7c3e3e68e83545fc221
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 1642972ff3 -s ours am: ↵Xin Li
ea6876bac8 -s ours am: 2ddff843ae -s ours am skip reason: Change-Id I199f0079097cbd7b8b553a705d973d556d8860a4 with SHA-1 e827769263 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/12795747 Change-Id: Idb0c3364c02a2fefee20110d12137003b61e6e76
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 1642972ff3 -s ours am: ↵Xin Li
ea6876bac8 -s ours am skip reason: Change-Id I199f0079097cbd7b8b553a705d973d556d8860a4 with SHA-1 e827769263 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/12795747 Change-Id: Id36fb47e7b0bca18f5754992a7000a966b275b34
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 1642972ff3 -s oursXin Li
am skip reason: Change-Id I199f0079097cbd7b8b553a705d973d556d8860a4 with SHA-1 e827769263 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/12795747 Change-Id: Ia6d1407f1e3a4227c3f2f21a301018ab30b01d26
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I199f0079097cbd7b8b553a705d973d556d8860a4 Change-Id: I31a94d253066d5e4cdb444cbf21b5d32018a8898
2020-09-11[automerger skipped] Merge Android R am: ed44f0cbef -s ours am: 93349d1425 ↵Xin Li
-s ours am: 6b272c2ed4 -s ours am: 23445575f1 -s ours am: a70c4b653c -s ours am skip reason: Change-Id Idbf8064b452046180970762ee90d6539336fd54a with SHA-1 58f1f69a0e is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1422368 Change-Id: Ib2610d157beae54ae39b4ba777936eab8d1d37b3
2020-09-11[automerger skipped] Merge Android R am: ed44f0cbef -s ours am: 93349d1425 ↵Xin Li
-s ours am: 6b272c2ed4 -s ours am: 23445575f1 -s ours am skip reason: Change-Id Idbf8064b452046180970762ee90d6539336fd54a with SHA-1 58f1f69a0e is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1422368 Change-Id: Iecb66b86dfe078502d734b5bcef187f1df4c9341
2020-09-11[automerger skipped] Merge Android R am: ed44f0cbef -s ours am: 93349d1425 ↵Xin Li
-s ours am: 6b272c2ed4 -s ours am skip reason: Change-Id Idbf8064b452046180970762ee90d6539336fd54a with SHA-1 58f1f69a0e is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1422368 Change-Id: I33aab33c9bc17d554aa7ca9889ead80fc2808dfc
2020-09-11[automerger skipped] Merge Android R am: ed44f0cbef -s ours am: 93349d1425 ↵Xin Li
-s ours am skip reason: Change-Id Idbf8064b452046180970762ee90d6539336fd54a with SHA-1 58f1f69a0e is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1422368 Change-Id: Id949f4ecf73e9c4b4be8543d9566e5e93bbfa992
2020-09-11[automerger skipped] Merge Android R am: ed44f0cbef -s oursXin Li
am skip reason: Change-Id Idbf8064b452046180970762ee90d6539336fd54a with SHA-1 58f1f69a0e is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1422368 Change-Id: I18c998cf63cfd1ada1051f881a71e3d9e0aac1f0
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Idbf8064b452046180970762ee90d6539336fd54a Change-Id: I02e77b1f0125769eac1a34b00261633b8014e5bf
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 58f1f69a0e -s ours am: 32a1d90598 -s ours am: c83d2abdf2 -s ours am: ae02f3cbc2 -s ours am skip reason: Change-Id Ia2bf7669ab40996c26e2b0db5fec9387efa1a91b with SHA-1 a025d830e6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/12470069 Change-Id: I20dae1d794adfbb7c5c097271c42d9c135dace9c
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 58f1f69a0e -s ours am: 32a1d90598 -s ours am: c83d2abdf2 -s ours am skip reason: Change-Id Ia2bf7669ab40996c26e2b0db5fec9387efa1a91b with SHA-1 a025d830e6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/12470069 Change-Id: Id05ba9e43c27125049ef16e1852ae3e5e8b166bd
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 58f1f69a0e -s ours am: 32a1d90598 -s ours am skip reason: Change-Id Ia2bf7669ab40996c26e2b0db5fec9387efa1a91b with SHA-1 a025d830e6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/12470069 Change-Id: Id71efff9fcc0b422f3782d0794cc63fa65193b64
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 58f1f69a0e -s ours am skip reason: Change-Id Ia2bf7669ab40996c26e2b0db5fec9387efa1a91b with SHA-1 a025d830e6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/12470069 Change-Id: I7964d349d79d6a313926b8ce60fff84883efa617
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: Ia2bf7669ab40996c26e2b0db5fec9387efa1a91b Change-Id: Idbf8064b452046180970762ee90d6539336fd54a
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 69e476290c -s ours am: a025d830e6 am: e827769263 am: 477656d880 -s ours am skip reason: subject contains skip directive Change-Id: Ib95b429e9d7a6f66d864c4ef97e55727dd4295db
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 69e476290c -s ours am: a025d830e6 am: e827769263 Change-Id: I525a2f5b6ffe1eda593f86344e0542ac8a14ceab
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 69e476290c -s ours am: a025d830e6 Change-Id: I199f0079097cbd7b8b553a705d973d556d8860a4
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 69e476290c -s ours am skip reason: subject contains skip directive Change-Id: Ia2bf7669ab40996c26e2b0db5fec9387efa1a91b
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li
Bug: 151763422 Change-Id: I56e475c71d86aabffda46c53ac5bb37c7f240e36
2020-03-31Remove redundant NOTICE copied from LICENSE. am: cf280aa618 am: 4ee0d8262b ↵Bob Badour
am: 038a2bb49b am: 152e51a05e am: 83cab30d58 Change-Id: I66b19e6f60e46b1cd1dc05198baeb645a81e5724
2020-03-31Remove redundant NOTICE copied from LICENSE. am: cf280aa618 am: 4ee0d8262b ↵Bob Badour
am: 038a2bb49b am: 152e51a05e Change-Id: I88d112498e007960174b8c5eb95d8e1bd34e79b4
2020-03-31Remove redundant NOTICE copied from LICENSE. am: cf280aa618 am: 4ee0d8262b ↵Bob Badour
am: 038a2bb49b Change-Id: I24da524dfd1fb59d96809338d7574d888b97b6b8
2020-03-31Remove redundant NOTICE copied from LICENSE. am: cf280aa618 am: 4ee0d8262bBob Badour
Change-Id: I5a588f20ba00e0e835e7a5bbf70591e933d0c2a3
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 06:39:52 +0000