commit | fa811843fec84fdeee8ebd8e626673f1814c0ab1 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 13 18:24:34 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 13 18:24:34 2021 +0000 |
tree | 5d34087236ff89637ac5a201ecaefcda11ecdc72 | |
parent | b720d6166c331482116390dfab2b1eec96d261cb [diff] | |
parent | 9ca5de24645d6b2c79d589b410aa3fed0794b50c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ca5de2464 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14171949 Change-Id: Iab1bbd09e0c24030e6e396366a81537814afcee8