commit | 89b87974dceac55620be92d68359c990e455484c | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Dec 05 20:07:05 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 05 20:07:05 2022 +0000 |
tree | 88bc0f88997048cc71668332e30ab5574e2ddce9 | |
parent | 280073bea56d020f010569f799c8fa2fda7af132 [diff] | |
parent | 7fcf00bc41455f3d7b1f07d0068b9dd8b8107259 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 63c2e17977 -s ours am: 7fcf00bc41 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/20630508 Change-Id: I33322069b580753bce14b04b0f27917bba9edd7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>