commit | 21ae26893dd690f49c6fed34fcc927cb4d3a58ff | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Apr 18 04:31:03 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Apr 18 04:31:03 2021 +0000 |
tree | 540d5b936cc5462144840e9a7ab9cdcd3e26387b | |
parent | ae0849911e41d19f7ccb56326fd4734673be6fec [diff] | |
parent | 85369be6af5a0d6e824c8ca65d21b3b55469f99c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 85369be6af -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14227445 Change-Id: I110c76ec92b8f5f36827bfec14366fbc4883db1b