summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-04Merge "Fix a typo in a README" am: a22db3e230 am: fb6b4f90cb am: 36d1050dbb ↵HEADt_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-u-beta-1-gplandroid-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_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-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_r16android-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_uwb_341710010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_341510000aml_sch_331113000aml_sch_331111000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341717000aml_odp_341610000aml_net_341710020aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341014000aml_net_340913000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_341711000aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_ads_341720000aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000mastermain-16k-with-phonesmain-16kmainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-uwb-releaseandroid14-mainline-networking-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid13-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-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-networking-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-art-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz5_341510010aml_tz4_332714010Nikolas Havrikov
am: 736a602f2e Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1344657 Change-Id: I05d1ad3ee8206b09a7545bb91fc3b0803d37d57f
2022-01-04Merge "Fix a typo in a README" am: 431d21ceae am: 6cc80eddb2 am: b850045b72 ↵Nikolas Havrikov
am: d1a9104e9e Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1344656 Change-Id: I08bc40d0c74adabe2f3e15d333fc969348abc244
2022-01-04Merge "Fix a typo in a README" am: a22db3e230 am: fb6b4f90cb am: 36d1050dbbNikolas Havrikov
Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1344657 Change-Id: I8526972a220275a68232ca89a3b5245df79ffdfb
2022-01-04Merge "Fix a typo in a README" am: 431d21ceae am: 6cc80eddb2 am: b850045b72Nikolas Havrikov
Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1344656 Change-Id: Ia9aab4424e7e87b6a009bbfccf84b8f353be357a
2022-01-04Merge "Fix a typo in a README" am: a22db3e230 am: fb6b4f90cbNikolas Havrikov
Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1344657 Change-Id: Ib77547ae2b9aac8186ceed6a8f67020fe6439244
2022-01-04Merge "Fix a typo in a README" am: 431d21ceae am: 6cc80eddb2Nikolas Havrikov
Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1344656 Change-Id: I92460c44b159f3cb1221b6456d16f863b94d2068
2022-01-04Merge "Fix a typo in a README" am: a22db3e230Nikolas Havrikov
Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1344657 Change-Id: I2cc2ec7409ba4ffa04ef5f6752ed64969ede6413
2022-01-04Merge "Fix a typo in a README" am: 431d21ceaeNikolas Havrikov
Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1344656 Change-Id: Ia45538944c74e93a6556a96c36c3d8ccfd5f9739
2022-01-04Merge "Fix a typo in a README"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-1Nikolas Havrikov
2022-01-04Merge "Fix a typo in a README"Nikolas Havrikov
2022-01-04Fix a typo in a READMENikolas Havrikov
Change-Id: Ia1a816d6ef37ad6cb3c6f30fb464b17913f0f77e
2022-01-04Fix a typo in a READMENikolas Havrikov
Change-Id: I70785f9367cdd7c237cfa6f94e19f33329b2cdb9
2021-07-27Merge "Update language to comply with Android's inclusive language guidance" ↵Shikha Malhotra
am: ecb3b55542 am: 7a95b3e873 am: dceb891d2f am: 23551835b0 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1779486 Change-Id: I669228bc60c1f8f8642e7395ff04e85f6a9b030e
2021-07-27Merge "Update language to comply with Android's inclusive language guidance" ↵Shikha Malhotra
am: 70f25d25dc am: 0aa04fb067 am: 7f88c3c13c am: 92a62ab08f Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1778988 Change-Id: I231d00ab22ff361d260550a4e3c069ceefb324bf
2021-07-27Merge "Update language to comply with Android's inclusive language guidance" ↵Shikha Malhotra
am: ecb3b55542 am: 7a95b3e873 am: dceb891d2f Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1779486 Change-Id: Ibd6faef9b78a240fef148538a2365b14c93eff71
2021-07-27Merge "Update language to comply with Android's inclusive language guidance" ↵Shikha Malhotra
am: 70f25d25dc am: 0aa04fb067 am: 7f88c3c13c Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1778988 Change-Id: I933bdeb26db280847fbae4e99d24dae205afff71
2021-07-27Merge "Update language to comply with Android's inclusive language guidance" ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Shikha Malhotra
am: ecb3b55542 am: 7a95b3e873 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1779486 Change-Id: I2b621d8ef2cfad47a9d81c31a4a662500d434359
2021-07-27Merge "Update language to comply with Android's inclusive language guidance" ↵Shikha Malhotra
am: 70f25d25dc am: 0aa04fb067 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1778988 Change-Id: I1abb993c564ed6fa8c7b76678394736b001006ee
2021-07-27Merge "Update language to comply with Android's inclusive language guidance" ↵Shikha Malhotra
am: ecb3b55542 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1779486 Change-Id: Ib05b5fcaac4b3b9ddff6263e611600da391e3b10
2021-07-27Merge "Update language to comply with Android's inclusive language guidance" ↵Shikha Malhotra
am: 70f25d25dc Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1778988 Change-Id: I9304dccd252cb7626dca97ad7e458acf51409d6c
2021-07-27Merge "Update language to comply with Android's inclusive language guidance"android-s-beta-5android-s-beta-5Shikha Malhotra
2021-07-27Merge "Update language to comply with Android's inclusive language guidance"Shikha Malhotra
2021-07-27Update language to comply with Android's inclusive language guidanceShikha Malhotra
See https://source.android.com/setup/contribute/respectful-code for reference BUG=162536543 Test: No test, just word change for inclusivity Change-Id: I01bfa47d244255dfdf888ce891af922018744113
2021-07-27Update language to comply with Android's inclusive language guidanceShikha Malhotra
See https://source.android.com/setup/contribute/respectful-code for reference BUG=162536543 Change-Id: Id2125ddb211381b842a72322536fa9b4083adea0
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: fd6d228dd3 -s ↵Xin Li
ours am: e0380edbf3 -s ours am: f5164c4507 -s ours am skip reason: Change-Id Ia3ec4682c4b6574dd45893ae6502a7057a503c09 with SHA-1 0f25dc4aea is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If57cf668b6b6d84c6e51b4d471b297645fe48744
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: fd6d228dd3 -s ↵android-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-devXin Li
ours am: e0380edbf3 -s ours am skip reason: Change-Id Ia3ec4682c4b6574dd45893ae6502a7057a503c09 with SHA-1 0f25dc4aea is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I72859ef364714689cf00d8f7aa754bf62044f8bd
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: fd6d228dd3 -s oursXin Li
am skip reason: Change-Id Ia3ec4682c4b6574dd45893ae6502a7057a503c09 with SHA-1 0f25dc4aea is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2584bc0345e749088841230eb768ca6a70ea5492
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Xin Li
Bug: 180401296 Merged-In: Ia3ec4682c4b6574dd45893ae6502a7057a503c09 Change-Id: I6870a45da003c02131bf680fa747b5cb63041ae4
2020-11-24Mark ab/6881855 as merged am: b61d0ce87d am: 0f25dc4aeaXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/13111944 Change-Id: I2194aa7df3ad096b6763a82c061912a636090e30
2020-11-24Mark ab/6881855 as merged am: b61d0ce87dXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/13111944 Change-Id: Ia3ec4682c4b6574dd45893ae6502a7057a503c09
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: Ia6d26cd7ad7799f708027491bd3fa584dd6dc9d6
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9ff9c63183 -s ours am: ↵Xin Li
c2b8e235a8 -s ours am: 289f1b9319 -s ours am skip reason: Change-Id I507e7feae10d28d30e9c5141c1c084aaafa16c76 with SHA-1 01981df37f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/12795828 Change-Id: I16ae0053f70d84e03e1939726efd9cbe0718fdcf
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9ff9c63183 -s ours am: ↵Xin Li
c2b8e235a8 -s ours am skip reason: Change-Id I507e7feae10d28d30e9c5141c1c084aaafa16c76 with SHA-1 01981df37f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/12795828 Change-Id: Ia74bd53535645a9034da0b4848d9f727a7d34262
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9ff9c63183 -s oursXin Li
am skip reason: Change-Id I507e7feae10d28d30e9c5141c1c084aaafa16c76 with SHA-1 01981df37f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/12795828 Change-Id: Ib55875e3a706c518ffd8cf9701ac2586e3344085
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I507e7feae10d28d30e9c5141c1c084aaafa16c76 Change-Id: If9e9dd03739dc488c71b5eb087dc02483361ef21
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0943187c84 -s ours am: ↵Xin Li
c08b383866 -s ours am: f461e8c526 -s ours am: 65ffb4102a -s ours am: 0e61a6c001 -s ours am skip reason: Change-Id Iaee18ba48fc5a8ec511074dd10d69c383e92583b with SHA-1 9963fbe1af is in history Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1421707 Change-Id: If898a4d1eaa72276c5b23d752680a7a525d3e8ee
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0943187c84 -s ours am: ↵Xin Li
c08b383866 -s ours am: f461e8c526 -s ours am: 65ffb4102a -s ours am skip reason: Change-Id Iaee18ba48fc5a8ec511074dd10d69c383e92583b with SHA-1 9963fbe1af is in history Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1421707 Change-Id: I0a73c7838918a612f6d26e21548771c0fe831d47
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0943187c84 -s ours am: ↵Xin Li
c08b383866 -s ours am: f461e8c526 -s ours am skip reason: Change-Id Iaee18ba48fc5a8ec511074dd10d69c383e92583b with SHA-1 9963fbe1af is in history Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1421707 Change-Id: I1cdf6f3a6a546c79894717cc429c13f5116b6e18
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0943187c84 -s ours am: ↵Xin Li
c08b383866 -s ours am skip reason: Change-Id Iaee18ba48fc5a8ec511074dd10d69c383e92583b with SHA-1 9963fbe1af is in history Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1421707 Change-Id: Ib3bc90b76f92522be94dcd5834673a2de144f8c5
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0943187c84 -s oursXin Li
am skip reason: Change-Id Iaee18ba48fc5a8ec511074dd10d69c383e92583b with SHA-1 9963fbe1af is in history Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1421707 Change-Id: I7121e46731cba28a8270042394374654cef8e154
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Iaee18ba48fc5a8ec511074dd10d69c383e92583b Change-Id: Ie95a9023e5a251cbb5414b16adb92c1dd8ee1e9a
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9963fbe1af -s ours am: 489d395987 -s ours am: 4411a27f1c -s ours am: 9da45c9680 -s ours am skip reason: Change-Id I34ccc9cc6314aeb5babb95302be1801fc9bacd99 with SHA-1 b95e2339e3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/12469978 Change-Id: Iafeff5357c77b8f13cf956b3f56dc09c94056578
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9963fbe1af -s ours am: 489d395987 -s ours am: 4411a27f1c -s ours am skip reason: Change-Id I34ccc9cc6314aeb5babb95302be1801fc9bacd99 with SHA-1 b95e2339e3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/12469978 Change-Id: I5e2ef80a75e5be0d3f85603029c6d75fcb61a257
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9963fbe1af -s ours am: 489d395987 -s ours am skip reason: Change-Id I34ccc9cc6314aeb5babb95302be1801fc9bacd99 with SHA-1 b95e2339e3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/12469978 Change-Id: I9464ba4b79260ad9a612bb9029d380d4304435c3
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9963fbe1af -s ours am skip reason: Change-Id I34ccc9cc6314aeb5babb95302be1801fc9bacd99 with SHA-1 b95e2339e3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/12469978 Change-Id: I733d497507a8dd4efa50f3a14cac900b08d04563
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I34ccc9cc6314aeb5babb95302be1801fc9bacd99 Change-Id: Iaee18ba48fc5a8ec511074dd10d69c383e92583b
2020-07-31Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot
guidance" am: 9083088018 am: d4b1d127f1 am: 8b7a2346d1 am: 01981df37f am: 64682837c5 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1373478 Change-Id: I1b97901bbb8a8a8ef347672e9ed9b6dc8f60e176
2020-07-31Merge "Use more inclusive language for #inclusivefixit" am: dcc5eeb710 am: ↵Treehugger Robot
665843167d am: e4bc03637f am: e9e11599bc am: 3a3e355836 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1378936 Change-Id: I4aaf9f804eecdd872f33a147ca37f16ff4063fa8
2020-07-31Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot
guidance" am: 9083088018 am: d4b1d127f1 am: 8b7a2346d1 am: 01981df37f Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1373478 Change-Id: Ib2be770fc6e4647f249e894790e68bdb69fea003
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 11:20:14 +0000