summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-07Snap for 6657150 from 4b7113e273b71089d29695cdf960fb4861d1f4df to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-platform-11.0.0_r2android-platform-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r6android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid-build-team Robot
Change-Id: I42a857f38e079b27deb531842aef774ba01573c9
2020-07-06[automerger skipped] Import translations. DO NOT MERGE am: 17c91ccc41 -s oursandroid11-devBill Yi
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SafetyRegulatoryInfo/+/12081818 Change-Id: I1dcf9f7bd84616ece124770b0f9668e3dd15b238
2020-07-05Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: Ifd463a35a25c36c9c36a05c594fa32c729d2a46c
2020-05-31Snap for 6546046 from d80a845985f6988cbf369b27418a5b54204a390d to rvc-releaseandroid-build-team Robot
Change-Id: I040471cacf33d056500e70d0b4a973716d509716
2020-05-30Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: I4358dd0c6f488bbdf941ae1ed5c9256245cbb47b
2020-05-12Snap for 6484097 from 3f3fd83d75d95accefcd216924246bed3a9090bf to rvc-releaseandroid-build-team Robot
Change-Id: Idf1e9b5b0f5552c6e892fbc45019e7df78c7787c
2020-05-11Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: Ib933a3d02c657f4606d9c6735019415dad762ec2
2020-04-19Snap for 6409354 from c1b0ff2d52c6057a851cfe66bebd4bba905a1f67 to rvc-releaseandroid-build-team Robot
Change-Id: I24f2c52674afdbc8881d20fa9f43cb22079e6d29
2020-04-19Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: I02b7453b37dca909ba9bc6f26a6c2ad63e2f3971
2020-04-15Snap for 6396429 from eafe4ee61c755ffef2644492a8a80e0fc3588f72 to rvc-releaseandroid-build-team Robot
Change-Id: I311ae61d3619de77e211c0ffd8dda758f3cd4e12
2020-04-14Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: I351b7fd97a93984296bb8ee93b696736629f3cd8
2020-04-07Snap for 6370344 from 0073684bc75d757a4e355528c4f28560783ca661 to rvc-releaseandroid-build-team Robot
Change-Id: I895b799426020700cf3d086177c27e0710adc051
2020-04-05Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: I0207f976c22383d1ad96d100ce2dec4631570c18
2019-10-31Snap for 5978242 from 0ad209ef13afabf7efb79a96a748abb8e99513c3 to rvc-releaseandroid-build-team Robot
Change-Id: I3fcc45dc57c841fa17c7fafadf5b34cbcc7f4b17
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: e1ce24d120 am: ee11b572bc -s ours am skip reason: subject contains skip directive Change-Id: I545f74d8cee2e159b84feefd509cb9667b53fdd3
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: e1ce24d120 Change-Id: I24a423f4df608a3029b62842aea7c8eb40a47a8b
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I77ac202fe6abad2a721be6f453df877b8a5da4f8
2019-10-27Snap for 5969935 from 2ea70fd062d7866cb85dc22109bde96ca1230c65 to rvc-releaseandroid-build-team Robot
Change-Id: I82abeffddb6a507cd2149e37864dd2391823d674
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: e86cdce2b1 -s ↵Xin Li
ours am: 153f3acf17 -s ours am: 9059e1c8ff -s ours am: 7265fdfa36 -s ours am skip reason: change_id Ie5ef0e7550a78f7469e49e02aff5732375eabff9 with SHA1 929e3af7ed is in history Change-Id: I27b4bcf283faf9fcd102bd5c9d20cb274e21b826
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: e86cdce2b1 -s ↵Xin Li
ours am: 153f3acf17 -s ours am: 9059e1c8ff -s ours am skip reason: change_id Ie5ef0e7550a78f7469e49e02aff5732375eabff9 with SHA1 929e3af7ed is in history Change-Id: Ib0fcc13c42e7648e3d8325437dd82a080a8c63b8
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: e86cdce2b1 -s oursXin Li
am: 153f3acf17 -s ours am skip reason: change_id Ie5ef0e7550a78f7469e49e02aff5732375eabff9 with SHA1 929e3af7ed is in history Change-Id: I9eeafcc72036bd2445ba6b42ac8c3215e05a26f8
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP masterXin Li
am: e86cdce2b1 -s ours am skip reason: change_id Ie5ef0e7550a78f7469e49e02aff5732375eabff9 with SHA1 929e3af7ed is in history Change-Id: Ia264b8873d23126a13370d36eb7b14b2fe90640a
2019-10-26Snap for 5968874 from 400c987a20e597bdce813bf06213f00b76b49bc9 to rvc-releaseandroid-build-team Robot
Change-Id: I4e438cb850f821c819e3fc7f6c42fbd038a47888
2019-10-25Merge Coral/Flame into AOSP masterXin Li
Bug: 141248619 Change-Id: Ib681d5115b8b09f47014d24d238507a167b53acf Merged-In: Ie5ef0e7550a78f7469e49e02aff5732375eabff9
2019-10-23Skip QD1A.190821.011 in stage-aosp-master am: 929e3af7ed am: 5504efc1d5Xin Li
am: bf4622d89e Change-Id: I216c6f30dda224adaf3fbac4b9d12eca15fa386b
2019-10-23Skip QD1A.190821.011 in stage-aosp-master am: 929e3af7edXin Li
am: 5504efc1d5 Change-Id: Iafa52dfee35cfad4d87cea4414053c68f9f676c4
2019-10-23Skip QD1A.190821.011 in stage-aosp-masterXin Li
am: 929e3af7ed Change-Id: Ib525fec374675ae31928fad0d1e7d1b59744c1fa
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterb_141248619Xin Li
Bug: 141248619 Change-Id: Ie5ef0e7550a78f7469e49e02aff5732375eabff9
2019-09-12Snap for 5870090 from fea7d9e41989e603b8616aa06b1a3c24b224ff82 to rvc-releaseandroid-build-team Robot
Change-Id: I1c11a84cc81b16c849e7d2d39fc8c68b22516fab
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 0da0033d7a -s ours am: 69841017f4 -s ours am: 75e02fac60 -s ours am skip reason: change_id I9901bd8685f2ad213d7d0efa88c51c9bba80a539 with SHA1 83cf9c312f is in history Change-Id: I1dbf62809e0c813b41e750f58cd6153ec5d4d8bc
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 0da0033d7a -s ours am: 69841017f4 -s ours am skip reason: change_id I9901bd8685f2ad213d7d0efa88c51c9bba80a539 with SHA1 83cf9c312f is in history Change-Id: I26e57647ea7a8b89cb131ded198be2ed64f3b496
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 0da0033d7a -s ours am skip reason: change_id I9901bd8685f2ad213d7d0efa88c51c9bba80a539 with SHA1 83cf9c312f is in history Change-Id: Ieba8ed0d2a3373da317d8a1f3fe2da328d1621b9
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
Bug: 135460123 Change-Id: If9fb5056963515e7dfc7551af87033caaffd22d8 Merged-In: I9901bd8685f2ad213d7d0efa88c51c9bba80a539
2019-09-07Snap for 5860386 from 16f94c1d4d590bc056b4f0348433be8276cd5b21 to rvc-releaseandroid-build-team Robot
Change-Id: I0321cffee493550197cf355ddb781425d1d97468
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
83cf9c312f -s ours am: 5e3efc46e3 am: d9170bea07 am: a5678b9ea3 -s ours am skip reason: subject contains skip directive Change-Id: Ifa41c30414ba03968150f7ba2f63f395ed5eea1e
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
83cf9c312f -s ours am: 5e3efc46e3 am: d9170bea07 Change-Id: I4efe2db61ae074a24fc876e0458a540ef89fae96
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
83cf9c312f -s ours am: 5e3efc46e3 Change-Id: I6f65da5f44b2397fcaa55968bbdeeb7d30c3a131
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: 83cf9c312f -s ours am skip reason: subject contains skip directive Change-Id: Ia596aa37fdcbc63066a9f903221411c050e6884e
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: I9901bd8685f2ad213d7d0efa88c51c9bba80a539
2019-07-18Snap for 5736215 from 679d04071fbed465472ade5768702c1264bccad2 to rvc-releaseandroid-build-team Robot
Change-Id: If0ef3372a828f68c233f06dc94c05aa9c45d8f48
2019-07-18Snap for 5736565 from ddad1b1ae5066c55e5a73e3845a8b74b28feea33 to ↵android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-build-team Robot
qt-c2f2-release Change-Id: Iaaa9750babf7378bab996dc5ed7e0abe7633ef9d
2019-07-17Add new images for the overlay of safety and regulatory am: ddad1b1ae5Yanting Yang
am: 7c7f88c6f7 Change-Id: I4be16a370c03dc2aa7a35e308bac85bbf6deb903
2019-07-17Add new images for the overlay of safety and regulatoryYanting Yang
am: ddad1b1ae5 Change-Id: I44892dd3511df1e980d82a5f1695356a79c24a1b
2019-07-16Add new images for the overlay of safety and regulatoryandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-releaseYanting Yang
We have to define all used images in SafetyRegulatoryInfo, otherwise these new images are not able to show on regulatory manual page. Bug: 130313512 Test: visual Change-Id: I23da69fce2ff62abb09ce9e8f8de467d6179154d
2019-07-10Snap for 5716344 from ccee8d91425f2a3835713f73812889a199a72fa5 to rvc-releaseandroid-build-team Robot
Change-Id: Id6b8dd46de127d9dfb71c38cb1b30f0fe4f7b4bb
2019-07-09[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master am: 4883dc2be2 -s ours am: 6dd2aa11ef -s ours am: cda8baef33 am: 6b61a91490 -s ours am skip reason: subject contains skip directive Change-Id: Ic64aa263cc7ae5c71413be47503179b0c6337841
2019-07-09[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master am: 4883dc2be2 -s ours am: 6dd2aa11ef -s ours am: cda8baef33 Change-Id: I64036c83903d886a5ff1b1cff19f7476efdb30fa
2019-07-09[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master am: 4883dc2be2 -s ours am: 6dd2aa11ef -s ours am skip reason: subject contains skip directive Change-Id: I0d7c5b21568863e976b205fbfdbd35dbefad35d9
2019-07-09[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵temp_140451723Xin Li
(PPRL.190705.004) into master am: 4883dc2be2 -s ours am skip reason: subject contains skip directive Change-Id: I121f110a101ba3693337cba84fca08751dd1e0cd
2019-07-09DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into masterandroid-o-mr1-iot-release-1.0.14Xin Li
Bug: 136196576 Change-Id: I8e361ac55588805f22259ae29d3b70e75026a10e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 00:46:12 +0000