commit | 70517ab022450980e611a9fd1cb7320b309d7432 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Oct 07 14:46:34 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 07 14:46:34 2020 +0000 |
tree | e9d822b0fc47f761a7c685499217fda359c5ce72 | |
parent | 5d29c1510b7365cf58a6ce2a02bcc14ee33d6c0f [diff] | |
parent | cfe0491c27a990ce59f95ac89a6fca9ff779b466 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: cfe0491c27 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779776 Change-Id: I6d43d953eccaa78a34bf74c384874d227a1e818e