diff options
author | Xin Li <delphij@google.com> | 2021-02-20 11:46:40 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-20 11:46:40 +0000 |
commit | a3e8cbbf8d76f2446b26021fe1de6eeb2eeb049d (patch) | |
tree | 282ecb140139a5cff47b139b1d2b936c92fefd72 | |
parent | 3fd39658c647b18f397941bc6ae95d93b2ec21cc (diff) | |
parent | fb01a48139a7fd86de2e6a50b82f23cece233fee (diff) | |
download | mockito-a3e8cbbf8d76f2446b26021fe1de6eeb2eeb049d.tar.gz |
[automerger skipped] Mark ab/7061308 as merged in stage. am: 485127ff50 -s ours am: fb01a48139 -s oursandroid-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-1
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
0 files changed, 0 insertions, 0 deletions