commit | cf775451c2cb87eb9c71c3206448615182095f9e | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 05 16:38:54 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 05 16:38:54 2020 +0000 |
tree | aec68baa34917b6025e4d0c825f5ec7b35f5cd7d | |
parent | 4f4b55a5570f11e6cc71a6c4e762b160d7ea4cd8 [diff] | |
parent | 05ab7cc7118dabd0ad69d15de2524664ae5534ce [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 54c37b2e14 -s ours am: 9c2d89b123 -s ours am: 05ab7cc711 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759563 Change-Id: Iab3ad71c058d31b2adf65a41b897627ecf9c2290