diff options
author | Xin Li <delphij@google.com> | 2021-02-20 12:08:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-20 12:08:24 +0000 |
commit | 80d8601830ae3243cb35a67aec5f0a78dc3c32cf (patch) | |
tree | 4ebddc490b229a7fa48d6852af38e4a50d1fcff1 | |
parent | 0ef109412e0f4fa5acc200d7422ce19b1218c19c (diff) | |
parent | ed75f5409d22e2d158dd67c3cce298557767c74d (diff) | |
download | libcups-80d8601830ae3243cb35a67aec5f0a78dc3c32cf.tar.gz |
[automerger skipped] Mark ab/7061308 as merged in stage. am: 8022ba4c5c -s ours am: ed75f5409d -s oursandroid-s-v2-preview-1android-s-qpr3-beta-1android-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-1android-s-qpr3-beta-1
am skip reason: Change-Id I57fd1311f32a700716e6bb7ddeffc0aeb794e374 with SHA-1 e64f4deecb is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I808cf7f2f6f7336f592802131a7c485445fbe6c7
0 files changed, 0 insertions, 0 deletions