| commit | f1a3c6972df7e1513243ea1939a2170af2196862 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat May 15 23:09:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 15 23:09:02 2021 +0000 |
| tree | 125c8f04e2b129881d3ef4712bddbbd3e80aeb02 | |
| parent | 3b1def1bdc1c72f017f2e63355095fa67a6494ed [diff] | |
| parent | 0f282f243a0d414e5fc1e6d87b668b7d25778d08 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 06c04811ab -s ours am: d16b245115 -s ours am: d908c0a544 -s ours am: f784b7b960 -s ours am: 0f282f243a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1685007 Change-Id: Ie1cebcf8ca36a91b083f147e1ae910997566768d