commit | 7c0f16970c291f6077eabedf79049900a298c4ee | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu May 13 18:29:12 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 13 18:29:12 2021 +0000 |
tree | cb39cf8a8acee2fd1b47abab5c0f6872bae93019 | |
parent | 111f20eaa27495247311c241df5a6a6d42a62286 [diff] | |
parent | e1d39cf04163a560b3b8b49210ebae953ca57312 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e1d39cf041 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14532062 Change-Id: Ib052fb6e5a3eaacaf27787f1c84fc631e5c20ba9