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