summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-08[automerger skipped] Merge "Merge Android 12" am: a54e1e729e -s ours am: ↵t_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_r3android-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_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_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_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_331131000main-16k-with-phonesmain-16kandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-gsiandroid14-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-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-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
115fe5b131 -s ours am: 304b179f39 -s ours am: 44dba288f5 -s ours am: 5485ae3b29 -s ours am skip reason: Merged-In I7f3a5953100762858d24643624e437854c390d99 with SHA-1 2389374e68 is already in history Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1847118 Change-Id: I81ddc88a0a4bb61b8c173ff9c5d6110021f03b22
2021-10-08[automerger skipped] Merge "Merge Android 12" am: a54e1e729e -s ours am: ↵Xin Li
115fe5b131 -s ours am: 304b179f39 -s ours am: 44dba288f5 -s ours am skip reason: Merged-In I7f3a5953100762858d24643624e437854c390d99 with SHA-1 2389374e68 is already in history Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1847118 Change-Id: Ib8e5ca9dccfeea9dad4123b112556a48a376316d
2021-10-08[automerger skipped] Merge "Merge Android 12" am: a54e1e729e -s ours am: ↵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
115fe5b131 -s ours am: 304b179f39 -s ours am skip reason: Merged-In I7f3a5953100762858d24643624e437854c390d99 with SHA-1 2389374e68 is already in history Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1847118 Change-Id: Iac39dd6f701df7efccd44e5703d6160346fa25db
2021-10-08[automerger skipped] Merge "Merge Android 12" am: a54e1e729e -s ours am: ↵Xin Li
115fe5b131 -s ours am skip reason: Merged-In I7f3a5953100762858d24643624e437854c390d99 with SHA-1 2389374e68 is already in history Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1847118 Change-Id: I0dad6786feda2fed0f3650f357c5a0afa3d43e5b
2021-10-08[automerger skipped] Merge "Merge Android 12" am: a54e1e729e -s oursXin Li
am skip reason: Merged-In I7f3a5953100762858d24643624e437854c390d99 with SHA-1 2389374e68 is already in history Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1847118 Change-Id: I29861d676ece6d2a1dbd81a93d23a8e6a90f08e0
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: I7f3a5953100762858d24643624e437854c390d99 Change-Id: I770f88f62926e72ca776010c86efa3c60b4b9059
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
2389374e68 -s ours am: 2cfc5c4682 -s ours am: 8e6666241c -s ours am: 7c8946c7dd -s ours am skip reason: Merged-In I568c9f7f1e0e3deb561b13ccb2fd5ef99463b360 with SHA-1 5ffe5cf5ba is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/15571726 Change-Id: I71cefb7d36449d92ce207cea010af2f1751c5d12
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
2389374e68 -s ours am: 2cfc5c4682 -s ours am: 8e6666241c -s ours am skip reason: Merged-In I568c9f7f1e0e3deb561b13ccb2fd5ef99463b360 with SHA-1 5ffe5cf5ba is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/15571726 Change-Id: I3c8a9e75d2d3a6b4f7dda84c1f2119f510068519
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
2389374e68 -s ours am: 2cfc5c4682 -s ours am skip reason: Merged-In I568c9f7f1e0e3deb561b13ccb2fd5ef99463b360 with SHA-1 5ffe5cf5ba is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/15571726 Change-Id: I9a2eae9ac1c27a3f4473ef779bb6079a618350df
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
2389374e68 -s ours am skip reason: Merged-In I568c9f7f1e0e3deb561b13ccb2fd5ef99463b360 with SHA-1 5ffe5cf5ba is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/15571726 Change-Id: Ic5dccf4f0d6d2e7592be9c49ba9f8b07486e099b
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I568c9f7f1e0e3deb561b13ccb2fd5ef99463b360 Change-Id: I7f3a5953100762858d24643624e437854c390d99
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I8003e4f685cfec05c0201e2d55eb54206dd1ea1a
2021-05-29Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/objenesis" am: 8aa13b8c1b ↵Bob Badour
am: bd478b841a am: fa4f264b50 am: 7e3ec7519a am: ebcb8d3a56 Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1588631 Change-Id: I215d4e1bb069e3e0740fa0d6a6fd272fb15b7bfc
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 9189101c2e -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: ed5d07f754 -s ours am: 5ffe5cf5ba -s ours am skip reason: Change-Id Idc6eea7089eb139029872414b517da7d22560d6b with SHA-1 2e7bd2403b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I450838a24f7412243b8017a0f081404ffbfcb1ac
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 9189101c2e -s ↵Xin Li
ours am: ed5d07f754 -s ours am: 5ffe5cf5ba -s ours am skip reason: Change-Id Idc6eea7089eb139029872414b517da7d22560d6b with SHA-1 2e7bd2403b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8a026fdca9bd0cee8229007d51acf05a552cb079
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 9189101c2e -s ↵android-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-releaseXin Li
ours am: ed5d07f754 -s ours am skip reason: Change-Id Idc6eea7089eb139029872414b517da7d22560d6b with SHA-1 2e7bd2403b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I568c9f7f1e0e3deb561b13ccb2fd5ef99463b360
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 9189101c2e -s oursXin Li
am skip reason: Change-Id Idc6eea7089eb139029872414b517da7d22560d6b with SHA-1 2e7bd2403b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I315ba3bcd0782d89b12a732a33e97ed0e8a7746d
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: Idc6eea7089eb139029872414b517da7d22560d6b Change-Id: Ie6cac09a9b513e3712e1160d7d264161dddafa90
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/objenesis" am: 8aa13b8c1b ↵Bob Badour
am: bd478b841a am: fa4f264b50 am: 7e3ec7519a Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1588631 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I375121092d0089f1c486bc7e6d12f88fbd0475ff
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/objenesis" am: 8aa13b8c1b ↵Bob Badour
am: bd478b841a am: fa4f264b50 am: 7e3ec7519a Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1588631 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8bcedcb56f7391ce85276cf80d285708c731d006
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/objenesis" am: 8aa13b8c1b ↵Bob Badour
am: bd478b841a am: fa4f264b50 Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1588631 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I463ca12b6e3e8682ac9640248f58b23e514837ee
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/objenesis" am: 8aa13b8c1b ↵Bob Badour
am: bd478b841a Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1588631 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id0d168cac4dbd9441b9a96196c0904cad3037e04
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/objenesis" am: 8aa13b8c1bBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1588631 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6f2972f9515b77badd04faad270c0b3e624d4955
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/objenesis"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/objenesisBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp tck-android/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I6619c087965fdc808952cc6f56379acb1e7cbbfa
2020-11-24Mark ab/6881855 as merged am: dfada88c05 am: 2e7bd2403bXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/13112858 Change-Id: Ibbcf145a8cba80301c2b71c56cc9fddeb18dcadc
2020-11-24Mark ab/6881855 as merged am: dfada88c05Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/13112858 Change-Id: Idc6eea7089eb139029872414b517da7d22560d6b
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I509db478b86ca6d376c28d2b65afeacda4e71d0c
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3f92ee00a5 -s ours am: ↵Xin Li
c395eb8453 -s ours am: abb4b15533 -s ours am skip reason: Change-Id I11f599adfd061c2ba44a760ca09cfcb72d6f5fcc with SHA-1 04afb274cf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/12795753 Change-Id: I3bd87346820b29db5a5aa911e1010bb1d4b62291
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3f92ee00a5 -s ours am: ↵Xin Li
c395eb8453 -s ours am skip reason: Change-Id I11f599adfd061c2ba44a760ca09cfcb72d6f5fcc with SHA-1 04afb274cf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/12795753 Change-Id: I6da007f3d3f34474a497e23ecc66ba8fd9b1bddb
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3f92ee00a5 -s oursXin Li
am skip reason: Change-Id I11f599adfd061c2ba44a760ca09cfcb72d6f5fcc with SHA-1 04afb274cf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/12795753 Change-Id: Id7d684a7479cb05ead2a8c4d51cbdee252f57b49
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I11f599adfd061c2ba44a760ca09cfcb72d6f5fcc Change-Id: If4f47cb96e815c730e7c64219fd4b07b87ea5b73
2020-09-11[automerger skipped] Merge "Merge Android R" am: 48f9195593 -s ours am: ↵Xin Li
12cbb02ed8 -s ours am: 80cb71c3f4 -s ours am: d02a08aa4f -s ours am: 19a94cd75b -s ours am skip reason: Change-Id I688cf9a8010c1def4043e5b1caa819dbf18da5f4 with SHA-1 c3ac2cd7ed is in history Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1422358 Change-Id: I8fb26b3c3abd18d36e2d2643271680fd13759f99
2020-09-11[automerger skipped] Merge "Merge Android R" am: 48f9195593 -s ours am: ↵Xin Li
12cbb02ed8 -s ours am: 80cb71c3f4 -s ours am: d02a08aa4f -s ours am skip reason: Change-Id I688cf9a8010c1def4043e5b1caa819dbf18da5f4 with SHA-1 c3ac2cd7ed is in history Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1422358 Change-Id: If3d9d75e8918a362bcaaed003e26e1d3ccfc583a
2020-09-11[automerger skipped] Merge "Merge Android R" am: 48f9195593 -s ours am: ↵Xin Li
12cbb02ed8 -s ours am: 80cb71c3f4 -s ours am skip reason: Change-Id I688cf9a8010c1def4043e5b1caa819dbf18da5f4 with SHA-1 c3ac2cd7ed is in history Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1422358 Change-Id: Id5fa044fda3d8a1a42897a567b68fb60b34b9b97
2020-09-11[automerger skipped] Merge "Merge Android R" am: 48f9195593 -s ours am: ↵Xin Li
12cbb02ed8 -s ours am skip reason: Change-Id I688cf9a8010c1def4043e5b1caa819dbf18da5f4 with SHA-1 c3ac2cd7ed is in history Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1422358 Change-Id: I9b7ad21c92edcabbdc11d56d470c3bea6afb4148
2020-09-11[automerger skipped] Merge "Merge Android R" am: 48f9195593 -s oursXin Li
am skip reason: Change-Id I688cf9a8010c1def4043e5b1caa819dbf18da5f4 with SHA-1 c3ac2cd7ed is in history Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1422358 Change-Id: Ieb676ef6077216f0a7777bac9bd3166d4abd1c7f
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I688cf9a8010c1def4043e5b1caa819dbf18da5f4 Change-Id: I4889d325202b6da35685631e0a92fad599fa138b
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c3ac2cd7ed -s ours am: 0584e17af2 -s ours am: 131a7515c5 -s ours am: e75ffbaaa3 -s ours am skip reason: Change-Id I0d83429a02c4b72bf9bee84e8817641b2fae5eeb with SHA-1 3d5ad5c763 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/12469676 Change-Id: Iddf81e4c7eb618eaf293424e57a49e66ca69fbce
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c3ac2cd7ed -s ours am: 0584e17af2 -s ours am: 131a7515c5 -s ours am skip reason: Change-Id I0d83429a02c4b72bf9bee84e8817641b2fae5eeb with SHA-1 3d5ad5c763 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/12469676 Change-Id: I3609e2a7014a2693d3bc7b1d11f00e83baea09b1
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c3ac2cd7ed -s ours am: 0584e17af2 -s ours am skip reason: Change-Id I0d83429a02c4b72bf9bee84e8817641b2fae5eeb with SHA-1 3d5ad5c763 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/12469676 Change-Id: Ie732ca775c26997ca35a790c9b44f66a843cd83b
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c3ac2cd7ed -s ours am skip reason: Change-Id I0d83429a02c4b72bf9bee84e8817641b2fae5eeb with SHA-1 3d5ad5c763 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/12469676 Change-Id: I0796ac26290a82d6f550ed1e94361fd23feb7c9c
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I0d83429a02c4b72bf9bee84e8817641b2fae5eeb Change-Id: I688cf9a8010c1def4043e5b1caa819dbf18da5f4
2020-04-29Merge "Add METADATA to objenesis: Apache2=NOTICE" am: ef460f3c40 am: ↵Treehugger Robot
e5b2a52dfd am: 3d5ad5c763 am: 04afb274cf am: ed36f91f6d Change-Id: Icd5dfe1172adb23bb26afa7e19965c2e8acec7bc
2020-04-29Merge "Add METADATA to objenesis: Apache2=NOTICE" am: ef460f3c40 am: ↵Treehugger Robot
e5b2a52dfd am: 3d5ad5c763 am: 04afb274cf Change-Id: I17869d03beb3553d1b3532f25bcf2d831e0b21ff
2020-04-29Merge "Add METADATA to objenesis: Apache2=NOTICE" am: ef460f3c40 am: ↵Treehugger Robot
e5b2a52dfd am: 3d5ad5c763 Change-Id: I11f599adfd061c2ba44a760ca09cfcb72d6f5fcc
2020-04-29Merge "Add METADATA to objenesis: Apache2=NOTICE" am: ef460f3c40 am: e5b2a52dfdTreehugger Robot
Change-Id: I0d83429a02c4b72bf9bee84e8817641b2fae5eeb
2020-04-29Merge "Add METADATA to objenesis: Apache2=NOTICE" am: ef460f3c40android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I34e7d0d8a4dc8f57d1d40d6c33a09db8f161790e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 06:42:57 +0000