summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-07Snap for 10453563 from fb1f9e9ccd2c2ae32326c74346cb33d7f925190a to ↵aml_mpr_341511070aml_mpr_341411070aml_mpr_341313030aml_mpr_341111030aml_mpr_341111020aml_mpr_341015090aml_mpr_341015030aml_mpr_340919000android14-mainline-mediaprovider-releaseAndroid Build Coastguard Worker
mainline-mediaprovider-release Change-Id: I39cf4dd3897a11a07caca863c0ef841094c0d98d
2023-01-18Merge "Add alias for mockito-core naming scheme" am: 9241a45d30 am: ↵android-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_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-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-releaseAlan Viverette
33de180a1a am: d033d9ff9e Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/2393172 Change-Id: I6c290b77dfc3bfacd8f2aa32c0def257bef8c729 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18Merge "Add alias for mockito-core naming scheme" am: 9241a45d30 am: 33de180a1aAlan Viverette
Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/2393172 Change-Id: I32da1516857d31b78cffef61bd3c793e2b5e96d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18Merge "Add alias for mockito-core naming scheme" am: 9241a45d30android-u-beta-1-gplAlan Viverette
Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/2393172 Change-Id: Iddcb7a5d9626bbfff2d8df73a9e0b4a6d7d132bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18Merge "Add alias for mockito-core naming scheme"main-16k-with-phonesAlan Viverette
2023-01-18Add alias for mockito-core naming schemeAlan Viverette
Bug: 265820493 Change-Id: Iec7178482f7101e0a933b349b6d73dcc3e53d082 Test: it builds
2022-10-26Merge "Fix errorprone warnings that should be errors" am: e4cddf0555 am: ↵Treehugger Robot
8455c9ae16 am: 078a2a13d4 Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/2255051 Change-Id: Ice77912be84219c4742e97afda865eeb723ce924 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors" am: e4cddf0555 am: ↵Treehugger Robot
8455c9ae16 Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/2255051 Change-Id: I0ebe90430063c5af9f222b7e6fdce7f4d411d1e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors" am: e4cddf0555Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/2255051 Change-Id: Ibaab3aa4c76347dde638d57dc3b90393fc525505 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors"Treehugger Robot
2022-10-15Fix errorprone warnings that should be errorsCole Faust
This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: I907959a17cd5fdf6504a654a08b4be93ef400d88
2022-05-11Snap for 8570526 from c978470e72bceeb947b9ab201554f48b31200675 to ↵aml_mpr_331918000aml_mpr_331812020aml_mpr_331711020aml_mpr_331613010aml_mpr_331512020aml_mpr_331412040aml_mpr_331311080aml_mpr_331112050aml_mpr_331112030aml_mpr_331011070aml_mpr_330911040aml_mpr_330811020android13-mainline-mediaprovider-releaseAndroid Build Coastguard Worker
mainline-mediaprovider-release Change-Id: I800705961cf4d1571a015545751ee3826b68c551
2022-01-14Merge "Updating byte-buddy from 1.8.15 to 1.9.3" am: f18976c094 am: ↵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_332714010Sorin Basca
f0ec16c204 am: 1082433307 am: 60a5acae76 Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1948576 Change-Id: I266cff9f1ea733be2405e02d9ee0f0d12c5b607a
2022-01-14Merge "Updating byte-buddy from 1.8.15 to 1.9.3" am: f18976c094 am: ↵Sorin Basca
f0ec16c204 am: 1082433307 Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1948576 Change-Id: I16a92dd12a25fce507effb13aa7516d27d99d00e
2022-01-14Merge "Updating byte-buddy from 1.8.15 to 1.9.3" am: f18976c094 am: f0ec16c204Sorin Basca
Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1948576 Change-Id: I9ec753a05263de4494a6383f72bcc68a43987cb2
2022-01-14Merge "Updating byte-buddy from 1.8.15 to 1.9.3" am: f18976c094Sorin Basca
Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1948576 Change-Id: If941abcad58a95716618c3798d3bd70f607d99ed
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-06-17Snap for 7468467 from e548fb759f3e61a9b6326babdb23dfae05335ac2 to ↵android-mainline-12.0.0_r90android-mainline-12.0.0_r76android-mainline-12.0.0_r48android-mainline-12.0.0_r31android-mainline-12.0.0_r121android-mainline-12.0.0_r11android-mainline-12.0.0_r106aml_mpr_311911090android12-mainline-mediaprovider-releaseandroid-build-team Robot
mainline-mediaprovider-release Change-Id: I04b8203898551b8d50156bf376fe9e07fa842625
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I54b2d22fc3cb6f4b537cd5a3c79390ea2a760244
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 485127ff50 -s ↵Xin Li
ours am: fb01a48139 -s ours am: a3e8cbbf8d -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: I3ef8eb3f29e2d64824a15b3106eeedab43ecd6d8
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 485127ff50 -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: fb01a48139 -s ours am: a3e8cbbf8d -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: I14d0037bc110d626d4f9a80a08cebac0ac7b52ad
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 am: 3fd39658c6 Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1588954 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I62e558cae43d50dbbbcc510a5d705c161bb1b14a
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mockito" am: 2d7cca944c am: ↵Bob Badour
6706f18ce2 am: b648206c8e am: 3fd39658c6 Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1588954 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia8653092022481adad174a6ea69c8ff73acf65e5
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: ↵Treehugger Robot
ac46fec399 am: 823fafe166 Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1573033 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I932503537e361f4853c62f1c103e6f66c71f10d0
2021-02-04Merge "Remove me from OWNERS file" am: 1569d6a662 am: 9ecc6830dd am: ↵Treehugger Robot
ac46fec399 am: 823fafe166 Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1573033 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4be2015d29033759ba7c52276d19a20cb8b1dade
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 00:51:51 +0000