summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-14Merge "Updating byte-buddy from 1.8.15 to 1.9.3"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-1Sorin Basca
2022-01-13Updating byte-buddy from 1.8.15 to 1.9.3Sorin Basca
Bug: 135459087 Test: Presubmit Change-Id: I5c3124028258e95ee2b0504d1efe6e8da8ad9460
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 485127ff50 -s ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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-s-v2-preview-1Xin Li
ours am: fb01a48139 -s ours am skip reason: Change-Id Ia1f0066b013154d43e3a1a645e4552790814ee46 with SHA-1 449a269475 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic0cec7e89a131dfe5345a2cd540013480cbdb0ee
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 485127ff50 -s oursXin Li
am skip reason: Change-Id Ia1f0066b013154d43e3a1a645e4552790814ee46 with SHA-1 449a269475 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I41686dd004e44660627116bfbc619cb4253202d5
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: Ia1f0066b013154d43e3a1a645e4552790814ee46 Change-Id: Ic046e9f0828241228935b4e2f389c67a91fb9c90
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mockito" am: 2d7cca944c am: ↵Bob Badour
6706f18ce2 am: b648206c8e Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1588954 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I00a8ae06986b512e3a9b7e15c50936fe6b6f9d90
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mockito" am: 2d7cca944c am: ↵Bob Badour
6706f18ce2 Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1588954 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie329bd69603b00ab17ef0496a1a36abfbde34c9f
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mockito" am: 2d7cca944cBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1588954 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib99e39c501d34456d029192ef2cdd6549b711992
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mockito"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/mockitoBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Id5ddf2261ef4ffd8f238a28fa96a81e49369e58b
2021-02-04Merge "Remove me from OWNERS file" am: 1569d6a662 am: 9ecc6830dd am: ac46fec399Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1573033 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icf1f3beeac92b2ab07a56a4d93d992dd636f2e4f
2021-02-04Merge "Remove me from OWNERS file" am: 1569d6a662 am: 9ecc6830ddTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1573033 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If574b87fbe4ec9e9ce0a3005fcd5c72e72cd7972
2021-02-04Merge "Remove me from OWNERS file" am: 1569d6a662Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1573033 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idb5f6d148e5cbe1c2c921612ecef9c7fdb57b6c0
2021-02-03Merge "Remove me from OWNERS file"Treehugger Robot
2021-02-03Remove me from OWNERS filePhilip P. Moltmann
(also removed invalid entry for jmonk@) Test: n/a Change-Id: If1994e47f937b8bfa6bfb47f9e825c971aac6161
2020-11-24Mark ab/6881855 as merged am: 6e416902e5 am: 449a269475Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/13112857 Change-Id: Ic1f319d21a5f7d968ff5c15f9c51e7799b0899fc
2020-11-24Mark ab/6881855 as merged am: 6e416902e5Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/13112857 Change-Id: Ia1f0066b013154d43e3a1a645e4552790814ee46
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ie4b6bbd9eaa7268839c04158681beb90754e3d08
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: f823643d83 -s ours am: ↵Xin Li
6da1fecdac -s ours am: 1fdf972de4 -s ours am skip reason: Change-Id I375c49e3604130dadfa180c765b14cb0a85ae90b with SHA-1 aacfe5f421 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/12796232 Change-Id: I09d759414146d6da2e3872706721008d4af5dcd7
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: f823643d83 -s ours am: ↵Xin Li
6da1fecdac -s ours am skip reason: Change-Id I375c49e3604130dadfa180c765b14cb0a85ae90b with SHA-1 aacfe5f421 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/12796232 Change-Id: If6c8d2b67aa6425e155876de06634be7324cacbd
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: f823643d83 -s oursXin Li
am skip reason: Change-Id I375c49e3604130dadfa180c765b14cb0a85ae90b with SHA-1 aacfe5f421 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/12796232 Change-Id: I703c3359e8980b373c47514c11aa288bbd82c716
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I375c49e3604130dadfa180c765b14cb0a85ae90b Change-Id: Ia56a98bbe35d760cbab47ab5ad8751d41281d5ca
2020-09-11[automerger skipped] Merge "Merge Android R" am: d5f1dc5d21 -s ours am: ↵Xin Li
958c50e62d -s ours am: 5213d007b6 -s ours am: ca53b78f5c -s ours am: cc3575d2af -s ours am skip reason: Change-Id Idc30a671f3fab9b67f82623cfe1feec44ac36a15 with SHA-1 36fd98c382 is in history Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1421774 Change-Id: Iba9c3e4761576968c307d332dfcfbf2922331e79
2020-09-11[automerger skipped] Merge "Merge Android R" am: d5f1dc5d21 -s ours am: ↵Xin Li
958c50e62d -s ours am: 5213d007b6 -s ours am: ca53b78f5c -s ours am skip reason: Change-Id Idc30a671f3fab9b67f82623cfe1feec44ac36a15 with SHA-1 36fd98c382 is in history Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1421774 Change-Id: I99fb39c1162c4410999ac75f69ac7713cf4a7db2
2020-09-11[automerger skipped] Merge "Merge Android R" am: d5f1dc5d21 -s ours am: ↵Xin Li
958c50e62d -s ours am: 5213d007b6 -s ours am skip reason: Change-Id Idc30a671f3fab9b67f82623cfe1feec44ac36a15 with SHA-1 36fd98c382 is in history Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1421774 Change-Id: Id161efe2562e7b8aebaa7ba26d108863d8dcee47
2020-09-11[automerger skipped] Merge "Merge Android R" am: d5f1dc5d21 -s ours am: ↵Xin Li
958c50e62d -s ours am skip reason: Change-Id Idc30a671f3fab9b67f82623cfe1feec44ac36a15 with SHA-1 36fd98c382 is in history Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1421774 Change-Id: Id480492d78e551025345d4b0ec4c086cebe64c31
2020-09-11[automerger skipped] Merge "Merge Android R" am: d5f1dc5d21 -s oursXin Li
am skip reason: Change-Id Idc30a671f3fab9b67f82623cfe1feec44ac36a15 with SHA-1 36fd98c382 is in history Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1421774 Change-Id: I5c706020e85c6b4cc88c454cf0cc37e2be656e4e
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Idc30a671f3fab9b67f82623cfe1feec44ac36a15 Change-Id: I462bb3b3ec6a8b6271e02355e8fb0a4414377493
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 36fd98c382 -s ours am: 22cf1906cf -s ours am: 7434b54993 -s ours am: 7c89deb20f -s ours am skip reason: Change-Id I1634dc6e15698465b63881dfcfbb6c86bbd93e2f with SHA-1 9eee099922 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/12470182 Change-Id: Ie7cc1db6d9d0c0296b984f842848678571cdc946
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 36fd98c382 -s ours am: 22cf1906cf -s ours am: 7434b54993 -s ours am skip reason: Change-Id I1634dc6e15698465b63881dfcfbb6c86bbd93e2f with SHA-1 9eee099922 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/12470182 Change-Id: I163d5711d38448b4f870de6498e3d1a0b6a54b61
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 36fd98c382 -s ours am: 22cf1906cf -s ours am skip reason: Change-Id I1634dc6e15698465b63881dfcfbb6c86bbd93e2f with SHA-1 9eee099922 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/12470182 Change-Id: I9a8b1c23dd82d493044ec258736a3190364394b1
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 36fd98c382 -s ours am skip reason: Change-Id I1634dc6e15698465b63881dfcfbb6c86bbd93e2f with SHA-1 9eee099922 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/12470182 Change-Id: I7dcc126543f553b6230c961f300f7e2094a855c8
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I1634dc6e15698465b63881dfcfbb6c86bbd93e2f Change-Id: Idc30a671f3fab9b67f82623cfe1feec44ac36a15
2020-04-29Merge "Add METADATA to mockito: MIT+Apache2=NOTICE" am: 09a2a3a8c0 am: ↵Treehugger Robot
370ee71047 am: 9eee099922 am: aacfe5f421 am: 21501f9bea Change-Id: Id5761a7b682abcae7c13dafe04a7c4db6e64cfc5
2020-04-29Merge "Add METADATA to mockito: MIT+Apache2=NOTICE" am: 09a2a3a8c0 am: ↵Treehugger Robot
370ee71047 am: 9eee099922 am: aacfe5f421 Change-Id: I863b4b20c064cb2b05e30b34ae187d2899af4840
2020-04-29Merge "Add METADATA to mockito: MIT+Apache2=NOTICE" am: 09a2a3a8c0 am: ↵Treehugger Robot
370ee71047 am: 9eee099922 Change-Id: I375c49e3604130dadfa180c765b14cb0a85ae90b
2020-04-29Merge "Add METADATA to mockito: MIT+Apache2=NOTICE" am: 09a2a3a8c0 am: ↵Treehugger Robot
370ee71047 Change-Id: I1634dc6e15698465b63881dfcfbb6c86bbd93e2f
2020-04-29Merge "Add METADATA to mockito: MIT+Apache2=NOTICE" am: 09a2a3a8c0android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I94de485f6953291863984853cd12f2bb628ca93e
2020-04-29Merge "Add METADATA to mockito: MIT+Apache2=NOTICE"Treehugger Robot
2020-04-28Add METADATA to mockito: MIT+Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I2d8b17c15fc968e3c21298740bd05c37a98e3db5
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e0e022e52b -s ours am: fbe7c41a60 am: 96b4e0e656 am: f707dec1f4 -s ours am skip reason: subject contains skip directive Change-Id: If12e6bbc7e979b37b0b7b307457d11f10ecf273c
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e0e022e52b -s ours am: fbe7c41a60 am: 96b4e0e656 Change-Id: I1531b5c715c3278071fe8ba65e4554cc4762cbf9
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e0e022e52b -s ours am: fbe7c41a60 Change-Id: Ia99d25f477b7f0ab297ca36ea9c0126d6b7dd5c3
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e0e022e52b -s ours am skip reason: subject contains skip directive Change-Id: I795c5c8e61ba209857351eb1e77a247fdb3d8386
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Ia3e34b930980fea825f69dcc59b2096e94998107
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 536a6b8dbb am: ↵Treehugger Robot
fc5209bff6 am: 156672ff09 am: bcfcf206f6 am: 0607c7c31d Change-Id: Ia8f97ef8cc98af36c4d278959a2a34b393f30efb
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 536a6b8dbb am: ↵Treehugger Robot
fc5209bff6 am: 156672ff09 am: bcfcf206f6 Change-Id: I75089ce90d987717bc0b81fd11f8c548a19e7969
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 536a6b8dbb am: ↵Treehugger Robot
fc5209bff6 am: 156672ff09 Change-Id: I7a9b6384f102f07b273d894e816d079957ee8303
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 536a6b8dbb am: ↵Treehugger Robot
fc5209bff6 Change-Id: Ie749032463a1c9631e4a1b85b40ea8a958ddd4c5
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 07:51:08 +0000