diff options
author | Bill Yi <byi@google.com> | 2021-04-23 00:21:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-23 00:21:58 +0000 |
commit | f784b7b96043214634c333ff888501cb03a59747 (patch) | |
tree | 125c8f04e2b129881d3ef4712bddbbd3e80aeb02 | |
parent | c2c5019256824e8a192c364d52a2abee4334d9af (diff) | |
parent | d908c0a544bba8d988ae75ca43f6aca10a8dc487 (diff) | |
download | colorpicker-android12L-dev.tar.gz |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 06c04811ab -s ours am: d16b245115 -s ours am: d908c0a544 -s oursandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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-devandroid12-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-dev
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1685007
Change-Id: If822a8987ffb67f433a54acaefc1b3d7096467ec
0 files changed, 0 insertions, 0 deletions