diff options
author | Xin Li <delphij@google.com> | 2021-02-20 15:34:35 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-20 15:34:35 +0000 |
commit | 4056291abc17bda6a3944cc7fdb76a7c38c1fad4 (patch) | |
tree | 2463dc1fc3604e2b96a0e336af6b3d2cf0fff867 /LICENSE | |
parent | 1dea109e0a909f63a76a3b2062b3f4df374cd5c3 (diff) | |
parent | 21be0a4652d1d7d775dab509e538568e2c9fee2d (diff) | |
download | lock_api-android12-qpr3-s4-release.tar.gz |
[automerger skipped] Mark ab/7061308 as merged in stage. am: 81d0e1d389 -s ours am: 21be0a4652 -s oursandroid-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-release
am skip reason: Change-Id I50639ce2d780b0ebb5730fced59b75b5c3a9c13f with SHA-1 7d8132e72b is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib66aaaf112ef15607cf7eea0c09125b943b19986
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions