summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mockito" am: 2d7cca944cBob Badour
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
2021-02-04Merge "Remove me from OWNERS file" am: 1569d6a662Treehugger Robot
2021-02-03Merge "Remove me from OWNERS file"Treehugger Robot
2021-02-03Remove me from OWNERS filePhilip P. Moltmann
2020-11-24Mark ab/6881855 as merged am: 6e416902e5Xin Li
2020-11-23Mark ab/6881855 as mergedXin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: f823643d83 -s ours am: 6da...Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: f823643d83 -s oursXin Li
2020-10-08Skip ab/6749736 in stage.Xin Li
2020-09-11[automerger skipped] Merge "Merge Android R" am: d5f1dc5d21 -s ours am: 958c5...Xin Li
2020-09-11[automerger skipped] Merge "Merge Android R" am: d5f1dc5d21 -s ours am: 958c5...Xin Li
2020-09-11[automerger skipped] Merge "Merge Android R" am: d5f1dc5d21 -s ours am: 958c5...Xin Li
2020-09-11[automerger skipped] Merge "Merge Android R" am: d5f1dc5d21 -s oursXin Li
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
2020-09-01[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li
2020-09-01[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li
2020-09-01[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
2020-04-29Merge "Add METADATA to mockito: MIT+Apache2=NOTICE" am: 09a2a3a8c0 am: 370ee7...Treehugger Robot
2020-04-29Merge "Add METADATA to mockito: MIT+Apache2=NOTICE" am: 09a2a3a8c0 am: 370ee7...Treehugger Robot
2020-04-29Merge "Add METADATA to mockito: MIT+Apache2=NOTICE" am: 09a2a3a8c0 am: 370ee7...Treehugger Robot
2020-04-29Merge "Add METADATA to mockito: MIT+Apache2=NOTICE" am: 09a2a3a8c0android-r-beta-3android-r-beta-2Treehugger Robot
2020-04-29Merge "Add METADATA to mockito: MIT+Apache2=NOTICE"Treehugger Robot
2020-04-28Add METADATA to mockito: MIT+Apache2=NOTICEBob Badour
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 536a6b8dbb am: fc520...Treehugger Robot
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 536a6b8dbb am: fc520...Treehugger Robot
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 536a6b8dbb am: fc520...Treehugger Robot
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 536a6b8dbb am: fc520...Treehugger Robot
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 536a6b8dbbTreehugger Robot
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE."Treehugger Robot
2020-03-25Remove redundant NOTICE copied from LICENSE.Bob Badour
2019-10-30[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...r_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-releaseXin Li
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-1Xin Li
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: 02fae86fd5 am: 9d1083d518Xin Li
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: 02fae86fd5Xin Li
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
2019-09-10Merge changes from topic "mockito-dexmaker-update-revert" am: ae3172e5fc am: ...Garfield Tan
2019-09-10Revert "Update to Mockito v2.25.7." am: 49ce6eaa60 am: 3cd6a51d47 am: efeed0526dGarfield Tan
2019-09-10Revert "Add a host test for Mockito." am: c8600e6ec8 am: c0f589004e am: 05b6b...Garfield Tan
2019-09-10Merge changes from topic "mockito-dexmaker-update-revert" am: ae3172e5fc am: ...Garfield Tan