commit | 4d99c848554041b85c763e4e9786e7a6c6df3433 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu May 13 18:29:42 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 13 18:29:42 2021 +0000 |
tree | cb39cf8a8acee2fd1b47abab5c0f6872bae93019 | |
parent | 7c0f16970c291f6077eabedf79049900a298c4ee [diff] | |
parent | a225d2dc131fd290fa72c60ae883258d77843543 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a225d2dc13 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14522578 Change-Id: I6d599d7957771081ab92731735f7e59c8cf5da68