| commit | 6bf87453a4bc12e8fbe1b9ce7c8fe07d34cfacd1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 20:18:24 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 20:18:24 2020 +0000 |
| tree | 7bd1e419d3510c1b5ec9750bebd3cdc1d91faef7 | |
| parent | 611c48232f777ed8f9ce6bbd8c81137426e57174 [diff] | |
| parent | a1476b50c6ed2a60474ded7751ad5acd3288461f [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: bca31c03a8 -s ours am: 3673c44b00 -s ours am: 63fdae7c73 -s ours am: 36c4232f03 -s ours am: 8eb03c34b3 -s ours am: a1476b50c6 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1420424 Change-Id: Ib7ac8692d96c291b3abf7552964b1d56646d86b7