commit | 5752ad2e271a2a0158af5b801266d64f035dfa94 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 18 02:35:35 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 18 02:35:35 2021 +0000 |
tree | a6aecc0be08ededf6995fef5e01e4bd817bd0dbb | |
parent | 0ebf14fd61ee0c71292abd3d521ccbdf7e7a377e [diff] | |
parent | 1b5d7b4c2a2b7ad9827dbf8557b97b5ef9d31465 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5055cf48b9 -s ours am: 1b5d7b4c2a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15599697 Change-Id: I8350cdc513f19ce78b672024f336f599f98b8dbf