| commit | f784b7b96043214634c333ff888501cb03a59747 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Apr 23 00:21:58 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 23 00:21:58 2021 +0000 |
| tree | 125c8f04e2b129881d3ef4712bddbbd3e80aeb02 | |
| parent | c2c5019256824e8a192c364d52a2abee4334d9af [diff] | |
| parent | d908c0a544bba8d988ae75ca43f6aca10a8dc487 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 06c04811ab -s ours am: d16b245115 -s ours am: d908c0a544 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1685007 Change-Id: If822a8987ffb67f433a54acaefc1b3d7096467ec