commit | 632df2155177d941635aeb5314d3fa1d8ed26e75 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Jul 12 18:10:54 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 12 18:10:54 2021 +0000 |
tree | 98420802f5bbee9829709c897860bc286ad5fb95 | |
parent | bc1a68255c3059bf86b5374f1e3abf4fdb4b6400 [diff] | |
parent | 24b7ba3636f094deabcf836ad117f225c29523e5 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 23061f1b50 -s ours am: b524d9932f -s ours am: 24b7ba3636 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15260115 Change-Id: Ic2fa8886b7ca32a3be83323b6a3abef0514befef