aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 3ca3226c6c -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_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_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_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid13-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_tz4_332714010Xin Li
fde26bfc52 -s ours am: 56516f92a7 -s ours am: acfb306cd5 -s ours am: df8e88e8d8 -s ours am skip reason: Merged-In I15335ac18df0a221456779909493ed186b4d5f85 with SHA-1 0500a76f00 is already in history Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1847424 Change-Id: I4e66c8d5c5ed2756c3049255a14bfc6220b19a95
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 3ca3226c6c -s ours am: ↵Xin Li
fde26bfc52 -s ours am: 56516f92a7 -s ours am: acfb306cd5 -s ours am skip reason: Merged-In I15335ac18df0a221456779909493ed186b4d5f85 with SHA-1 0500a76f00 is already in history Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1847424 Change-Id: I29b70617fba5c97ef9ec7954bd5aa259f1f834f9
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 3ca3226c6c -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
fde26bfc52 -s ours am: 56516f92a7 -s ours am skip reason: Merged-In I15335ac18df0a221456779909493ed186b4d5f85 with SHA-1 0500a76f00 is already in history Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1847424 Change-Id: I890612ec42de3c9c3c3f97a8c0db34e64dbe2762
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 3ca3226c6c -s ours am: ↵Xin Li
fde26bfc52 -s ours am skip reason: Merged-In I15335ac18df0a221456779909493ed186b4d5f85 with SHA-1 0500a76f00 is already in history Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1847424 Change-Id: I32c7f5f73627585f846af79a8d31151ba42113bb
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 3ca3226c6c -s oursXin Li
am skip reason: Merged-In I15335ac18df0a221456779909493ed186b4d5f85 with SHA-1 0500a76f00 is already in history Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1847424 Change-Id: Iba539248e98c0f20043b75282718516698ac7adb
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: I15335ac18df0a221456779909493ed186b4d5f85 Change-Id: Ia4c9239b378e80137802f0bdc9fdcccbc28e0321
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
0500a76f00 -s ours am: 7b293db127 -s ours am: 3b66729c00 -s ours am: 1ec54cd3f2 -s ours am skip reason: Merged-In I27ef01734a4cba57b8d04642984a96fdce299585 with SHA-1 543f2c338c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/15571805 Change-Id: I7e49855e83b589649a4101065f95b6a8536806ee
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
0500a76f00 -s ours am: 7b293db127 -s ours am: 3b66729c00 -s ours am skip reason: Merged-In I27ef01734a4cba57b8d04642984a96fdce299585 with SHA-1 543f2c338c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/15571805 Change-Id: I926ff54b20c60ec026a707d650bc49c031246a9b
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
0500a76f00 -s ours am: 7b293db127 -s ours am skip reason: Merged-In I27ef01734a4cba57b8d04642984a96fdce299585 with SHA-1 543f2c338c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/15571805 Change-Id: Iee38831836fd125f3951d2ad498eba22433a1813
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
0500a76f00 -s ours am skip reason: Merged-In I27ef01734a4cba57b8d04642984a96fdce299585 with SHA-1 543f2c338c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/15571805 Change-Id: I002fe26c29717d1bb442b2e7d8b4e33946b85ecb
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I27ef01734a4cba57b8d04642984a96fdce299585 Change-Id: I15335ac18df0a221456779909493ed186b4d5f85
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I6198722923404b33a9a0e6fb2b39366d0f0fb427
2021-02-21[automerger skipped] Mark ab/7061308 as merged in stage. am: 23764b95d6 -s ↵Xin Li
ours am: b68cfec20a -s ours am: 543f2c338c -s ours am skip reason: Change-Id I874fdeb7cee346b0beb9c897a57f4076a8ae4a99 with SHA-1 00f96b3f5a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia976a58ab7369d45c11e3ab267296a0e54883c98
2021-02-21[automerger skipped] Mark ab/7061308 as merged in stage. am: 23764b95d6 -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: b68cfec20a -s ours am: 543f2c338c -s ours am skip reason: Change-Id I874fdeb7cee346b0beb9c897a57f4076a8ae4a99 with SHA-1 00f96b3f5a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id12da9fd5a6f431eb595bf0acf9ba20cc5f76af0
2021-02-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/hamcrest" am: 3c480017c1 ↵Bob Badour
am: 8fb3ab4e2e am: 966cc388cc am: feba0c5892 Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1587903 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I27a80d52c500dac698969f4962b75cf1ae8bfa62
2021-02-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/hamcrest" am: 3c480017c1 ↵Bob Badour
am: 8fb3ab4e2e am: 966cc388cc am: feba0c5892 Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1587903 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie7e9267ad4367b72d59b017d9d437ff9a0193669
2021-02-21[automerger skipped] Mark ab/7061308 as merged in stage. am: 23764b95d6 -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: b68cfec20a -s ours am skip reason: Change-Id I874fdeb7cee346b0beb9c897a57f4076a8ae4a99 with SHA-1 00f96b3f5a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I27ef01734a4cba57b8d04642984a96fdce299585
2021-02-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/hamcrest" am: 3c480017c1 ↵Bob Badour
am: 8fb3ab4e2e am: 966cc388cc Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1587903 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9bc292f1ebb5837b16f162ad2235d65db397cfe4
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 23764b95d6 -s oursXin Li
am skip reason: Change-Id I874fdeb7cee346b0beb9c897a57f4076a8ae4a99 with SHA-1 00f96b3f5a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1746829d7b2ef1dfa4ad2f8a0bc8cf51499b6240
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: I874fdeb7cee346b0beb9c897a57f4076a8ae4a99 Change-Id: Ia81fbafa17f81c88f0ce4991ac5d7e159e8bb34c
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/hamcrest" am: 3c480017c1 ↵Bob Badour
am: 8fb3ab4e2e Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1587903 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I18ca0e0963ecd9f264ddda71fe57c3958feb8a1c
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/hamcrest" am: 3c480017c1Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1587903 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3c7418ff14e29f246216feb0fe887b755458d0c9
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/hamcrest"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/hamcrestBob Badour
Added SPDX-license-identifier-BSD to: Android.bp hamcrest-core/Android.bp hamcrest-library/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Id9817834e456f065748b1b021cefc612567d2ca3
2020-11-24Mark ab/6881855 as merged am: 9b5182989e am: 00f96b3f5aXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/13110884 Change-Id: Id611c0fbabff3ceb2c8a27cea2b61ffb7a9f8534
2020-11-24Mark ab/6881855 as merged am: 9b5182989eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/13110884 Change-Id: I874fdeb7cee346b0beb9c897a57f4076a8ae4a99
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I6935ec8dff81c2090cda67ff6fb969d4ba40730b
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3812aa80b3 -s ours am: ↵Xin Li
12bceca8e4 -s ours am: 58d38804a5 -s ours am skip reason: Change-Id Ifd4ae9b232d5e6a745c88a6b5ff22fecac71ab8e with SHA-1 bb6eea21ed is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/12796087 Change-Id: Ie42509f97ac75a6318400434f57963c99e123655
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3812aa80b3 -s ours am: ↵Xin Li
12bceca8e4 -s ours am skip reason: Change-Id Ifd4ae9b232d5e6a745c88a6b5ff22fecac71ab8e with SHA-1 bb6eea21ed is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/12796087 Change-Id: Ia1f7a5c4e2c6ae100e909e7d406bf3bf593f17f8
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3812aa80b3 -s oursXin Li
am skip reason: Change-Id Ifd4ae9b232d5e6a745c88a6b5ff22fecac71ab8e with SHA-1 bb6eea21ed is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/12796087 Change-Id: I72f5843c0766e57a806c269521aa1cbd294624ad
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ifd4ae9b232d5e6a745c88a6b5ff22fecac71ab8e Change-Id: Ia2267116235f3624b1cd8aa835a1df62038f5790
2020-09-11[automerger skipped] Merge "Merge Android R" am: 4c47d05f12 -s ours am: ↵Xin Li
d4f513a2e3 -s ours am: 34a847f361 -s ours am: 8afa499e12 -s ours am: 45e08efd13 -s ours am skip reason: Change-Id I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd with SHA-1 85e5a7f644 is in history Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1422369 Change-Id: I647b307ea0d52a08638b297bc97eea468872aa8f
2020-09-11[automerger skipped] Merge "Merge Android R" am: 4c47d05f12 -s ours am: ↵Xin Li
d4f513a2e3 -s ours am: 34a847f361 -s ours am: 8afa499e12 -s ours am skip reason: Change-Id I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd with SHA-1 85e5a7f644 is in history Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1422369 Change-Id: I1996003bc71ed9ba5f4999323ea1c7f83db403ff
2020-09-11[automerger skipped] Merge "Merge Android R" am: 4c47d05f12 -s ours am: ↵Xin Li
d4f513a2e3 -s ours am: 34a847f361 -s ours am skip reason: Change-Id I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd with SHA-1 85e5a7f644 is in history Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1422369 Change-Id: Iffa6471bdd04b2fc3953e1a2dfe8d41dca607052
2020-09-11[automerger skipped] Merge "Merge Android R" am: 4c47d05f12 -s ours am: ↵Xin Li
d4f513a2e3 -s ours am skip reason: Change-Id I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd with SHA-1 85e5a7f644 is in history Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1422369 Change-Id: I41119acf50ecede95add936f6a8a586eb7b280c4
2020-09-11[automerger skipped] Merge "Merge Android R" am: 4c47d05f12 -s oursXin Li
am skip reason: Change-Id I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd with SHA-1 85e5a7f644 is in history Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1422369 Change-Id: I3b1476c55a689d177fcfe9232ea8027e6200136b
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd Change-Id: Ib817e5d5346d8ad11c1f38944d910176f9cdc7bf
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85e5a7f644 -s ours am: 3b2d8d561e -s ours am: 814572cd4e -s ours am: 7aef08905c -s ours am skip reason: Change-Id I155b87208e6fc16bced6f6f295b84f79c5287147 with SHA-1 346bc2c2e0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/12470114 Change-Id: I8b46b156574ec50afe3bddbf41128c5bd61300bd
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85e5a7f644 -s ours am: 3b2d8d561e -s ours am: 814572cd4e -s ours am skip reason: Change-Id I155b87208e6fc16bced6f6f295b84f79c5287147 with SHA-1 346bc2c2e0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/12470114 Change-Id: Icd44a11b84273335e4b48da90bb41387f57f55b0
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85e5a7f644 -s ours am: 3b2d8d561e -s ours am skip reason: Change-Id I155b87208e6fc16bced6f6f295b84f79c5287147 with SHA-1 346bc2c2e0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/12470114 Change-Id: I38e9f27f0c3b8ed013fd15378a56ff757794e389
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85e5a7f644 -s ours am skip reason: Change-Id I155b87208e6fc16bced6f6f295b84f79c5287147 with SHA-1 346bc2c2e0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/12470114 Change-Id: Ib84272f4ba873c9c35679c16831c6b7272b84096
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I155b87208e6fc16bced6f6f295b84f79c5287147 Change-Id: I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd
2020-04-29Merge "Add METADATA to hamcrest: BSD+Apache2=NOTICE" am: f02197f28c am: ↵Treehugger Robot
c3f6da7e65 am: 346bc2c2e0 am: bb6eea21ed am: 895d226047 Change-Id: I39983c2950dd16c52c94141569d0bd59af38ea22
2020-04-29Merge "Add METADATA to hamcrest: BSD+Apache2=NOTICE" am: f02197f28c am: ↵Treehugger Robot
c3f6da7e65 am: 346bc2c2e0 am: bb6eea21ed Change-Id: I7ae5da1902a29760568ddc06e6185a98c721ac9e
2020-04-29Merge "Add METADATA to hamcrest: BSD+Apache2=NOTICE" am: f02197f28c am: ↵Treehugger Robot
c3f6da7e65 am: 346bc2c2e0 Change-Id: Ifd4ae9b232d5e6a745c88a6b5ff22fecac71ab8e
2020-04-29Merge "Add METADATA to hamcrest: BSD+Apache2=NOTICE" am: f02197f28c am: ↵Treehugger Robot
c3f6da7e65 Change-Id: I155b87208e6fc16bced6f6f295b84f79c5287147
2020-04-29Merge "Add METADATA to hamcrest: BSD+Apache2=NOTICE" am: f02197f28candroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I42705142aa37b7bb5369f35dce0b442a74f391cd
2020-04-29Merge "Add METADATA to hamcrest: BSD+Apache2=NOTICE"Treehugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 04:02:32 +0000