commit | c710b22dda90ce3c08f7cac1cd59f353518385ea | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 09 22:36:18 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 09 22:36:18 2021 +0000 |
tree | 40c9a278ce9e593cc04842674a86e9ade4c8c76e | |
parent | 6ac56f73559cec32bb11cb421d78f79d4b745c94 [diff] | |
parent | f777237523262a75e4e04271fadb4aeb3985618d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f777237523 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14143908 Change-Id: Id54e06cd04eafff6e8c4c952222462062c403f9b