| commit | 5e543d378a2248b81d318832df3c62e61f90b212 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 09 20:45:04 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 09 20:45:04 2021 +0000 |
| tree | dfa58b7662749ab2486299f96f763a7531c9c117 | |
| parent | f5dd8e6fb265d2084e95c07c8d5441e2addd3312 [diff] | |
| parent | 32075475df014f45da5ed36a79100db88bffaaaa [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 32075475df -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14140197 Change-Id: I31a87a8ac38050c666eaa0a9a2bbeecd99ce46c8