summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: cac7f8cbc7 -s ours ↵HEADandroid-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_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-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-releaseXin Li
am: 685d0ab6bc -s ours am: 2dc81d12c1 -s ours am: 47bfe9bc95 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/2186757 Change-Id: Ic8598be47f8c8a8983de325e793713969a5df49a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: cac7f8cbc7 -s ours ↵android-u-beta-1-gplmain-16k-with-phonesXin Li
am: 685d0ab6bc -s ours am: 2dc81d12c1 -s ours am skip reason: Merged-In I3d37fee446655b59b6b4837aaf9f8073d49d78db with SHA-1 e9be183035 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/2186757 Change-Id: I5e21d581f793f68b9e7f4f346ac843bf47334003 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: cac7f8cbc7 -s ours ↵Xin Li
am: 685d0ab6bc -s ours am skip reason: Merged-In I3d37fee446655b59b6b4837aaf9f8073d49d78db with SHA-1 e9be183035 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/2186757 Change-Id: I53689387eff271ec3e8649ce6b2a775296767e1a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: cac7f8cbc7 -s oursXin Li
am skip reason: Merged-In I3d37fee446655b59b6b4837aaf9f8073d49d78db with SHA-1 e9be183035 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/2186757 Change-Id: Iebfe21f4ccafcac0b968dec4ce5917302ce44ae7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15DO NOT MERGE - Merge Android 13main-16kXin Li
Bug: 242648940 Merged-In: I3d37fee446655b59b6b4837aaf9f8073d49d78db Change-Id: I7bc6909c8967c10e5a53c13ac22d522497c189d4
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
3fa92d8231 -s ours am: 4e1332872c -s ours am: caa93a0e72 -s ours am: 5392c8b00a -s ours am skip reason: Merged-In I3d37fee446655b59b6b4837aaf9f8073d49d78db with SHA-1 e9be183035 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/19091805 Change-Id: I1b7a65106c47be1b1bb803f90570e0d6547dd7f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
3fa92d8231 -s ours am: 4e1332872c -s ours am: caa93a0e72 -s ours am skip reason: Merged-In I3d37fee446655b59b6b4837aaf9f8073d49d78db with SHA-1 e9be183035 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/19091805 Change-Id: I9b1ec13c87b86cff9c581b49e6304a434c457f77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
3fa92d8231 -s ours am: 4e1332872c -s ours am skip reason: Merged-In I3d37fee446655b59b6b4837aaf9f8073d49d78db with SHA-1 e9be183035 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/19091805 Change-Id: Ie65689d71fc00508234ce5e4622953a84f6344a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
3fa92d8231 -s ours am skip reason: Merged-In I3d37fee446655b59b6b4837aaf9f8073d49d78db with SHA-1 e9be183035 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/19091805 Change-Id: Ic2870be0f0d3ea37715e1cfe26624655caed7ea5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27Merge tm-dev-plus-aosp-without-vendor@8763363temp_sam_242648940Xin Li
Bug: 236760014 Merged-In: I3d37fee446655b59b6b4837aaf9f8073d49d78db Change-Id: I95a8356e410a03ff743ce614a094f1cdc36c123c
2021-11-03Transfer ownership of backup lib to current B+R Platform team.t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-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_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_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_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-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-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-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-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_tz4_332714010Martin O'Hagan
Test: Infra changes Change-Id: I3d37fee446655b59b6b4837aaf9f8073d49d78db
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I6b48609eb54af0d0a9a83de5ca87b56e96cb3986
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1c202c87d7 -s ↵Xin Li
ours am: 1ddd8b25e0 -s ours am: 0584a973d2 -s ours am skip reason: Change-Id I790ce8d5e5e573ab896118d92c351bb43f42025c with SHA-1 500d7c41bb is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0e9a89eb0a6a986d5e861734ef092b048ac39724
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1c202c87d7 -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: 1ddd8b25e0 -s ours am: 0584a973d2 -s ours am skip reason: Change-Id I790ce8d5e5e573ab896118d92c351bb43f42025c with SHA-1 500d7c41bb is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0a28c512432ff703e0edf8824796045538006b22
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1c202c87d7 -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: 1ddd8b25e0 -s ours am skip reason: Change-Id I790ce8d5e5e573ab896118d92c351bb43f42025c with SHA-1 500d7c41bb is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idec4569b60faf5ca2554cdfdf46973e15f204c14
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1c202c87d7 -s oursXin Li
am skip reason: Change-Id I790ce8d5e5e573ab896118d92c351bb43f42025c with SHA-1 500d7c41bb is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id61c1a812567ca12bd51a8e6a14f2c896fe39068
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: I790ce8d5e5e573ab896118d92c351bb43f42025c Change-Id: I85a24ccfa9b61fe44725cc42333a38772489a201
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbackup am: aeba4c0b8e am: ↵Bob Badour
9e004583de am: e12ec3530c am: 09173297d1 Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1588863 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1f022fd94b253788d20f17ddcec25de2d24b12ee
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbackup am: aeba4c0b8e am: ↵Bob Badour
9e004583de am: e12ec3530c am: 09173297d1 Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1588863 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8cd49d687575d94146abbaa0c8e1ccb7bb0aa405
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbackup am: aeba4c0b8e am: ↵Bob Badour
9e004583de am: e12ec3530c Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1588863 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I46d8b833eb88d2f9d9aba0a76d27c82fb7bd9c0f
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbackup am: aeba4c0b8e am: ↵Bob Badour
9e004583de Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1588863 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic5a575726d6390a7e87f588e7cd3aac591133fc6
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbackup am: aeba4c0b8eBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1588863 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifed632f6c1bbed17edeaf0aac3c6264bee579bf1
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libbackupandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I0cd18951df69e39be03af00979acad5642d19e54
2020-11-24Mark ab/6881855 as merged am: 43c0d00475 am: 500d7c41bbXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/13110886 Change-Id: I87905a32ba0a9b6a1d2c1cf6d61ccfa7e419356f
2020-11-24Mark ab/6881855 as merged am: 43c0d00475Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/13110886 Change-Id: I790ce8d5e5e573ab896118d92c351bb43f42025c
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Iaf6d4294144da438dc2f4546c7698e23d020bb01
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 5b23f5fca3 -s ours am: ↵Xin Li
dbda981f51 -s ours am: e95465287f -s ours am skip reason: Change-Id I1e762c15b12e9308440bafaac5e574cb64e2ed9d with SHA-1 327626faf9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/12795749 Change-Id: I54ecbc5a279a37d975e9e4e87202a27d4bf200bf
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 5b23f5fca3 -s ours am: ↵Xin Li
dbda981f51 -s ours am skip reason: Change-Id I1e762c15b12e9308440bafaac5e574cb64e2ed9d with SHA-1 327626faf9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/12795749 Change-Id: I5e3c0e9521bbb74afa41cc5c2138e3453b1eadb0
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 5b23f5fca3 -s oursXin Li
am skip reason: Change-Id I1e762c15b12e9308440bafaac5e574cb64e2ed9d with SHA-1 327626faf9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/12795749 Change-Id: Iec9ef96a64a450ada651a25b6792af18aece063b
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I1e762c15b12e9308440bafaac5e574cb64e2ed9d Change-Id: If39176efb9b8eb41f717a7ca046def89eb167466
2020-09-11[automerger skipped] Merge Android R am: a57116554e -s ours am: a33524fe17 ↵Xin Li
-s ours am: e3c6e55b37 -s ours am: 108cb5e0ed -s ours am: b665931af0 -s ours am skip reason: Change-Id Ie7cb70566695de61c3605b1b279dff6b65275601 with SHA-1 7088c5a113 is in history Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1422371 Change-Id: Id13b9de7e5d77b765b71bcc36aee5008d3d5f1d7
2020-09-11[automerger skipped] Merge Android R am: a57116554e -s ours am: a33524fe17 ↵Xin Li
-s ours am: e3c6e55b37 -s ours am: 108cb5e0ed -s ours am skip reason: Change-Id Ie7cb70566695de61c3605b1b279dff6b65275601 with SHA-1 7088c5a113 is in history Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1422371 Change-Id: I32a77fa7057209a3170c398f06b1c57beda03c49
2020-09-11[automerger skipped] Merge Android R am: a57116554e -s ours am: a33524fe17 ↵Xin Li
-s ours am: e3c6e55b37 -s ours am skip reason: Change-Id Ie7cb70566695de61c3605b1b279dff6b65275601 with SHA-1 7088c5a113 is in history Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1422371 Change-Id: Idebd9605850316d4fb78016610cefd42a5b490a7
2020-09-11[automerger skipped] Merge Android R am: a57116554e -s ours am: a33524fe17 ↵Xin Li
-s ours am skip reason: Change-Id Ie7cb70566695de61c3605b1b279dff6b65275601 with SHA-1 7088c5a113 is in history Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1422371 Change-Id: I1277887afcc5822a14229831645eb9b7af0d9cfc
2020-09-11[automerger skipped] Merge Android R am: a57116554e -s oursXin Li
am skip reason: Change-Id Ie7cb70566695de61c3605b1b279dff6b65275601 with SHA-1 7088c5a113 is in history Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1422371 Change-Id: Ib2a7949b672873b706d7c8963103005336660f12
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Ie7cb70566695de61c3605b1b279dff6b65275601 Change-Id: I6f755c0e8df401a65273b7484b5bbaf3aa719aa7
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 7088c5a113 -s ours am: e91bce09e8 -s ours am: 7b57d7e31a -s ours am: eaf7265601 -s ours am skip reason: Change-Id I716019210e2540744f308510fed6ad0483c14e62 with SHA-1 17e308f8a6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/12470072 Change-Id: Ib301f94fe5e53d46493ace47584f5852bfd80941
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 7088c5a113 -s ours am: e91bce09e8 -s ours am: 7b57d7e31a -s ours am skip reason: Change-Id I716019210e2540744f308510fed6ad0483c14e62 with SHA-1 17e308f8a6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/12470072 Change-Id: I1afe78b59239dfdcf4f728a249ab074bd6214bd4
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 7088c5a113 -s ours am: e91bce09e8 -s ours am skip reason: Change-Id I716019210e2540744f308510fed6ad0483c14e62 with SHA-1 17e308f8a6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/12470072 Change-Id: I2682a23e459a600f5c2a37d9195cb309913ac150
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 7088c5a113 -s ours am skip reason: Change-Id I716019210e2540744f308510fed6ad0483c14e62 with SHA-1 17e308f8a6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/12470072 Change-Id: Ib9eb64ea5798850b4db59101249270e3b427f8db
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I716019210e2540744f308510fed6ad0483c14e62 Change-Id: Ie7cb70566695de61c3605b1b279dff6b65275601
2020-04-29Add METADATA to libbackup: Apache2=NOTICE am: 495ccb903e am: 3559a596e4 am: ↵Bob Badour
17e308f8a6 am: 327626faf9 am: dba2b0a0f9 Change-Id: I1b45797aaf42546f22945a994636c15845f462d6
2020-04-29Add METADATA to libbackup: Apache2=NOTICE am: 495ccb903e am: 3559a596e4 am: ↵Bob Badour
17e308f8a6 am: 327626faf9 Change-Id: I7ae47a092daad75df05e012582586fdb8ad0b351
2020-04-29Add METADATA to libbackup: Apache2=NOTICE am: 495ccb903e am: 3559a596e4 am: ↵Bob Badour
17e308f8a6 Change-Id: I1e762c15b12e9308440bafaac5e574cb64e2ed9d
2020-04-29Add METADATA to libbackup: Apache2=NOTICE am: 495ccb903e am: 3559a596e4Bob Badour
Change-Id: I716019210e2540744f308510fed6ad0483c14e62
2020-04-29Add METADATA to libbackup: Apache2=NOTICE am: 495ccb903eandroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: Idc273225ce118f9c063ec1a1233939ab4dc88d33
2020-04-28Add METADATA to libbackup: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ic5e4e26f47eccb7d2245a533902d5fda76fa5d53
2019-05-03Import from google3r_aml_301500702android-mainline-12.0.0_r55android-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_r10android11-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-releaseTransformer Team
See google3/third_party/java_src/android_libs/backup/copy.bara.sky. Project import generated by Copybara. Exempt-From-Owner-Approval: Ownership was incorrectly given to the Dialer team (b/131880800), but the team members don't actually have CodeReview+2 access. PiperOrigin-RevId: 246332340 Change-Id: I5488fc9fee9019c69437887f12dda110b85bc9a3
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-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_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: 6eb778c27d Change-Id: I5176a8a494ce8873c5e5a074209e512842573dc7
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I497e6042bbd2540ce6fda1a1a5e486e8691aed4a
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 08:12:27 +0000