commit | 07c54d9bbb0fb531c729c7c53ad30992524362ae | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Jul 04 17:16:43 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 04 17:16:43 2021 +0000 |
tree | 219e60d3860f955446dce898ce98e35e1f179c65 | |
parent | c90752b98b0e8efe3428c841769af58932b0422b [diff] | |
parent | d6a6e05b27192b1245250d008a47590cc4d23423 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3c26c8538c -s ours am: d6a6e05b27 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755757 Change-Id: Ie055cd4064369825ff4108f21b7f8129fda32b99