commit | 567fe7b464ce004e18a4f9a51daada60071b2acf | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Jul 12 18:11:04 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 12 18:11:04 2021 +0000 |
tree | 98420802f5bbee9829709c897860bc286ad5fb95 | |
parent | 632df2155177d941635aeb5314d3fa1d8ed26e75 [diff] | |
parent | afe4fb84bd807ea5baa64e00995173e9ca18e971 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: b8151fc862 -s ours am: f3c6f975fe -s ours am: afe4fb84bd -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15259833 Change-Id: I4cd5bca56bc5edaf9cbd12f9ddecfd4b7f5fdae9