commit | 7fcf00bc41455f3d7b1f07d0068b9dd8b8107259 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Dec 05 19:24:54 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 05 19:24:54 2022 +0000 |
tree | 125c8f04e2b129881d3ef4712bddbbd3e80aeb02 | |
parent | c4eea1399b3f6401d0a6c540b640892c04052043 [diff] | |
parent | 63c2e179773a819916cca972ccc8f06e82038105 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 63c2e17977 -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: I76bc194bca5e498935627c764a615fab16ed958d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>