| commit | 4d4adc1cdd31afa5386e40193119f23afb7cc1a1 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Apr 23 00:39:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 23 00:39:56 2021 +0000 |
| tree | 125c8f04e2b129881d3ef4712bddbbd3e80aeb02 | |
| parent | b70b9c2638c34f6590c7837b2a130b3510f167e2 [diff] | |
| parent | f784b7b96043214634c333ff888501cb03a59747 [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 skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1685007 Change-Id: Ib5c3220d8d5d2ed93d24adf38fe615a3efb19d25