commit | 902477724aec8268d73b1f3dbf257f2a2fe2d86b | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 13 16:26:33 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 13 16:26:33 2021 +0000 |
tree | 5d34087236ff89637ac5a201ecaefcda11ecdc72 | |
parent | cd1edf4e57232f0c62609d33490e7737eb7b8d14 [diff] | |
parent | 0f57ff1fe7bbecc89ac1d35eb9852aa60c51fb47 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0f57ff1fe7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14172938 Change-Id: I84845217fc90a2df2ef96370e763d998d0f24c5c