commit | 5a5913824062c44ca1045cd9080558bf8ec3dd8f | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Jun 07 05:19:25 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 07 05:19:25 2021 +0000 |
tree | 55b7cf662eb3da001ebfd1fbcb4f887d4a8dafec | |
parent | faa09625c79cef130f7a3b30dd1d2445ec204cea [diff] | |
parent | 38b6a92dc5a0049dd395f128f0dcd0ceeb513ebc [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 38b6a92dc5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14875213 Change-Id: I1a3a57facb08dfe2e262e20d8c40ab8644881132