commit | 6bd0451ae9bf209374dc2a1ee3e9ccdaaf897fd9 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Dec 04 10:55:54 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 04 10:55:54 2020 +0000 |
tree | b9a520299da0ba000d83b8c3988e3647fe4b6f93 | |
parent | 3bad338b3a340f99197085733f13dd84c546d2b0 [diff] | |
parent | fbeff629b53c9bbe78ff237dadb2680c1a25dbc8 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: fbeff629b5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13167245 Change-Id: I649fc0148f19755bfb63e87ed2997634b2300a7c