commit | 66915840539c1e0f82f440ef74cdf78cfeba00ec | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Apr 11 19:12:49 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Apr 11 19:12:49 2021 +0000 |
tree | c15000b5ed150231e7633f422a89a613d6584961 | |
parent | b8d22e9d3930022d8929c60a9d08e4dfa2f8f16c [diff] | |
parent | f107ad72aa33464c1faff5f11d5ea64aa807122c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6c261a3d85 -s ours am: f107ad72aa -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14156575 Change-Id: Id16a245f033d3ac35366b07f5d4c03759f850bf0