summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-08[automerger skipped] Merge Android 12 am: 0ebf3c13bf -s ours am: cb14cbeaa4 ↵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_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-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_r4android-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_r3android-14.0.0_r29android-14.0.0_r28android-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_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-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_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_341610000aml_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_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_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_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-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-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-releaseandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-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_332714010Xin Li
-s ours am: ec1d5c9a11 -s ours am: 4cec2305ab -s ours am: ea7ef0f630 -s ours am skip reason: Merged-In Iea25ab2acc22bf7e8dea6afeb5b26df04502e956 with SHA-1 f459a64379 is already in history Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1847513 Change-Id: Iddc978f1c374a973b4642ff7745b7576000ad64f
2021-10-08[automerger skipped] Merge Android 12 am: 0ebf3c13bf -s ours am: cb14cbeaa4 ↵Xin Li
-s ours am: ec1d5c9a11 -s ours am: 4cec2305ab -s ours am skip reason: Merged-In Iea25ab2acc22bf7e8dea6afeb5b26df04502e956 with SHA-1 f459a64379 is already in history Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1847513 Change-Id: Ia25036555efd4be9665e0414ab16d6c0f664e548
2021-10-08[automerger skipped] Merge Android 12 am: 0ebf3c13bf -s ours am: cb14cbeaa4 ↵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-1Xin Li
-s ours am: ec1d5c9a11 -s ours am skip reason: Merged-In Iea25ab2acc22bf7e8dea6afeb5b26df04502e956 with SHA-1 f459a64379 is already in history Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1847513 Change-Id: Ia1f3f404999f6e29041b62b9e842bb334ca6ed71
2021-10-08[automerger skipped] Merge Android 12 am: 0ebf3c13bf -s ours am: cb14cbeaa4 ↵Xin Li
-s ours am skip reason: Merged-In Iea25ab2acc22bf7e8dea6afeb5b26df04502e956 with SHA-1 f459a64379 is already in history Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1847513 Change-Id: Ic43244d3a9fdb04e1912bd0f4c4b4924fd1d9401
2021-10-08[automerger skipped] Merge Android 12 am: 0ebf3c13bf -s oursXin Li
am skip reason: Merged-In Iea25ab2acc22bf7e8dea6afeb5b26df04502e956 with SHA-1 f459a64379 is already in history Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1847513 Change-Id: Idbaec8a49cae4b7568264d96ac550d284cc7df60
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: Iea25ab2acc22bf7e8dea6afeb5b26df04502e956 Change-Id: Ic89d41cf1c14fc0eb824c675baea05ff63e5e540
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
f459a64379 -s ours am: f456cccf68 -s ours am: 4a6c25fea7 -s ours am: 2f32a5dc01 -s ours am skip reason: Merged-In I29c9fbb6fa3ecf335a3334a4a7365f86ef013542 with SHA-1 67138ba629 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/15571705 Change-Id: I60f8a2181c5cca3daf016f8e3caf12243e4912ad
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
f459a64379 -s ours am: f456cccf68 -s ours am: 4a6c25fea7 -s ours am skip reason: Merged-In I29c9fbb6fa3ecf335a3334a4a7365f86ef013542 with SHA-1 67138ba629 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/15571705 Change-Id: I4fa7cbb7e3b2be05437fb825baa64f708ad9f75c
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
f459a64379 -s ours am: f456cccf68 -s ours am skip reason: Merged-In I29c9fbb6fa3ecf335a3334a4a7365f86ef013542 with SHA-1 67138ba629 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/15571705 Change-Id: Idf69bd834611689f19508c6c6972a9a4dfd66b99
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
f459a64379 -s ours am skip reason: Merged-In I29c9fbb6fa3ecf335a3334a4a7365f86ef013542 with SHA-1 67138ba629 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/15571705 Change-Id: I2e897876430d7b5a53663cae4ec22b3c1c8f7874
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I29c9fbb6fa3ecf335a3334a4a7365f86ef013542 Change-Id: Iea25ab2acc22bf7e8dea6afeb5b26df04502e956
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 583cdaaf2d -s ↵Xin Li
ours am: 2528642aed -s ours am: 67138ba629 -s ours am skip reason: Change-Id I4d94d75fb92a90e3e0c39c7077a876b647ff359f with SHA-1 bfad48a776 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I799035d66e6a8cbb6a60ef472821f3e51fccf809
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 583cdaaf2d -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: 2528642aed -s ours am skip reason: Change-Id I4d94d75fb92a90e3e0c39c7077a876b647ff359f with SHA-1 bfad48a776 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I29c9fbb6fa3ecf335a3334a4a7365f86ef013542
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 583cdaaf2d -s oursXin Li
am skip reason: Change-Id I4d94d75fb92a90e3e0c39c7077a876b647ff359f with SHA-1 bfad48a776 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I96b9339368956e949a39ff80a30254711361dd00
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: I4d94d75fb92a90e3e0c39c7077a876b647ff359f Change-Id: Ifd03fdf294f6fb3c9dea850a4dffb920b675324e
2020-11-24Mark ab/6881855 as merged am: 266defdc03 am: bfad48a776Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/13111971 Change-Id: Id57f60bb632585ff034de67fdafbfd203eaafd1f
2020-11-24Mark ab/6881855 as merged am: 266defdc03Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/13111971 Change-Id: I4d94d75fb92a90e3e0c39c7077a876b647ff359f
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I6d6c9ef7ef2e6c0fd3d012f4c08a6e4fd57e9f85
2020-10-14Remove xr directory am: 771c2254b9 am: 9baf655e38 am: 8fd689c67f am: e60aadc967Colin Cross
Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1458597 Change-Id: If9d84d76177bbb7a944f08fa1b50625713cda0cd
2020-10-14Remove xr directory am: 771c2254b9 am: 9baf655e38 am: 8fd689c67fColin Cross
Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1458597 Change-Id: I95fc55184664b88a8af6ca83dbde9936e1546659
2020-10-14Remove xr directory am: 771c2254b9 am: 9baf655e38Colin Cross
Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1458597 Change-Id: Ie068ed994986ead66e01ee06a35ff44cc8abc41a
2020-10-14Remove xr directory am: 771c2254b9Colin Cross
Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1458597 Change-Id: I7f9d51a4556444803512e62ae9e36233b6387d9b
2020-10-13Remove xr directoryColin Cross
It's not used. Test: m checkbuild Change-Id: I3c755a3aad3f7ffea8e2da67cdb6dfd4142c7738
2020-09-11[automerger skipped] Merge Android R am: b85105e946 -s ours am: fafa1b08dc ↵Xin Li
-s ours am: 009ea695e2 -s ours am: ef96f113d8 -s ours am: 50d9c7d656 -s ours am skip reason: Change-Id I25f0ca04f2e967f35d377e923f73486b95dd47e3 with SHA-1 85259cdc08 is in history Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1422309 Change-Id: I587ef020108cd80f0f10df13d2eaa3187bf1a599
2020-09-11[automerger skipped] Merge Android R am: b85105e946 -s ours am: fafa1b08dc ↵Xin Li
-s ours am: 009ea695e2 -s ours am: ef96f113d8 -s ours am skip reason: Change-Id I25f0ca04f2e967f35d377e923f73486b95dd47e3 with SHA-1 85259cdc08 is in history Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1422309 Change-Id: I53a90b521fb0bfe7aab65bbc12a90ba22684306f
2020-09-11[automerger skipped] Merge Android R am: b85105e946 -s ours am: fafa1b08dc ↵Xin Li
-s ours am: 009ea695e2 -s ours am skip reason: Change-Id I25f0ca04f2e967f35d377e923f73486b95dd47e3 with SHA-1 85259cdc08 is in history Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1422309 Change-Id: I73746a1e200a3328ca9dce303b4f9672058423b0
2020-09-11[automerger skipped] Merge Android R am: b85105e946 -s ours am: fafa1b08dc ↵Xin Li
-s ours am skip reason: Change-Id I25f0ca04f2e967f35d377e923f73486b95dd47e3 with SHA-1 85259cdc08 is in history Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1422309 Change-Id: I9814d4cee3031bd525ca58d182ea82db3bcbbfd0
2020-09-11[automerger skipped] Merge Android R am: b85105e946 -s oursXin Li
am skip reason: Change-Id I25f0ca04f2e967f35d377e923f73486b95dd47e3 with SHA-1 85259cdc08 is in history Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1422309 Change-Id: I0900e62cf0016dcef3d58158a529db87eb1dce24
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I25f0ca04f2e967f35d377e923f73486b95dd47e3 Change-Id: Ifa6d7d277cdceed5735850461d501e335e90a0d7
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85259cdc08 -s ours am: 2dd936b552 -s ours am: 1812408f22 -s ours am: f8554a7d1e -s ours am skip reason: Change-Id I67f9a083e27a7f5134c810d95d19360e6e5a1b8f with SHA-1 19240f7c55 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/12470033 Change-Id: I028e7e6c7e0c10b68c477e34c931058aeea5b75e
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85259cdc08 -s ours am: 2dd936b552 -s ours am: 1812408f22 -s ours am skip reason: Change-Id I67f9a083e27a7f5134c810d95d19360e6e5a1b8f with SHA-1 19240f7c55 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/12470033 Change-Id: I24ecfe07cdf95dc4703805efb3cd70c1723d8f5d
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85259cdc08 -s ours am: 2dd936b552 -s ours am skip reason: Change-Id I67f9a083e27a7f5134c810d95d19360e6e5a1b8f with SHA-1 19240f7c55 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/12470033 Change-Id: I39a227887e888b8876c2a9671eeb2906426e256f
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85259cdc08 -s ours am skip reason: Change-Id I67f9a083e27a7f5134c810d95d19360e6e5a1b8f with SHA-1 19240f7c55 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/12470033 Change-Id: I6fb6f00bb088df81d82275995b91ec346d5fe7fd
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I67f9a083e27a7f5134c810d95d19360e6e5a1b8f Change-Id: I25f0ca04f2e967f35d377e923f73486b95dd47e3
2020-06-28Add METADATA to vrservices: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Exempt-From-Owner-Approval: janitorial work Change-Id: I4d53ef1fcca6529a5ffe28b614534fff3a1b5a5d
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseaml_tz2_305400100Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 26db848a52 am: 7cb17e865f -s ours am skip reason: subject contains skip directive Change-Id: I67f9a083e27a7f5134c810d95d19360e6e5a1b8f
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2android-r-beta-3android-r-beta-2Xin Li
stage-aosp-master am: 26db848a52 Change-Id: Ib6c77292f616ce6939e8cbfae94db1c69f1f32ba
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: I10408ec78855e2331dd556901e87e200b0a28e51
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: 4f104c9f70 am: 461c4c31b5Xin Li
am: 25452f657f Change-Id: Ie9e36c29fefcaf35a6ab20f8c7e2be993f6b9f2a
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: 4f104c9f70Xin Li
am: 461c4c31b5 Change-Id: Ic3ecf03c0a54055c0b4d0a035523620d84b3c09e
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
am: 4f104c9f70 Change-Id: I71c0c8fb043bbf99110add040133e6664c8200d7
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
Bug: 141248619 Change-Id: Iac69d623b6c72a1210ab73f752b1ed474d5db51f
2019-09-13Turn the lock screen off by default.Grant Yoshida
Bug: 141005456 Test: Wiped userdata on a OnePlus and verified lockscreen is disabled. Change-Id: If5ead126bd01a680dce16a3537a1cad996c47cff
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: a90a724d59 -s ours am: 12b4af1dd3 -s ours am: 656972aa76 -s ours am skip reason: change_id Ife0f708744ff9b2efdf900b9b5d58555f1487a11 with SHA1 d0da96f292 is in history Change-Id: If7afe4b3671940a01e7edddfe064774bf01c77bc
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: a90a724d59 -s ours am: 12b4af1dd3 -s ours am skip reason: change_id Ife0f708744ff9b2efdf900b9b5d58555f1487a11 with SHA1 d0da96f292 is in history Change-Id: I343e0b4a070069467cefcf73d883f2ce7a9ca114
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: a90a724d59 -s ours am skip reason: change_id Ife0f708744ff9b2efdf900b9b5d58555f1487a11 with SHA1 d0da96f292 is in history Change-Id: I0080389a9a4dbbb122f78dc500a918ff96a87fe9
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: Iea0f26e243a0ac792868a69b321849a3b9cc6773 Merged-In: Ife0f708744ff9b2efdf900b9b5d58555f1487a11
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
d0da96f292 -s ours am: 12c705c0f7 am: 75e56f882f am: c7cfd7cd76 -s ours am skip reason: subject contains skip directive Change-Id: Ibddc718cf60101602bb514c09242e3f61abfb93e
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
d0da96f292 -s ours am: 12c705c0f7 am: 75e56f882f Change-Id: I0915b615fd62d4ccbf7efda3eab629633ce750d6
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
d0da96f292 -s ours am: 12c705c0f7 Change-Id: Iebe2cff95fc96d4fc997300afdcc47bb35697233
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 02:30:03 +0000