diff options
author | Bill Yi <byi@google.com> | 2021-04-23 00:39:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-23 00:39:56 +0000 |
commit | 4d4adc1cdd31afa5386e40193119f23afb7cc1a1 (patch) | |
tree | 125c8f04e2b129881d3ef4712bddbbd3e80aeb02 | |
parent | b70b9c2638c34f6590c7837b2a130b3510f167e2 (diff) | |
parent | f784b7b96043214634c333ff888501cb03a59747 (diff) | |
download | colorpicker-android12-mainline-art-release.tar.gz |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 06c04811ab -s ours am: d16b245115 -s ours am: d908c0a544 -s ours am: f784b7b960 -s oursandroid-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1685007
Change-Id: Ib5c3220d8d5d2ed93d24adf38fe615a3efb19d25
0 files changed, 0 insertions, 0 deletions