commit | d1c2b6298d7fb21526dcc4075ca69af744fe9779 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 09 22:42:55 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 09 22:42:55 2021 +0000 |
tree | f51ac24f964662dd395bddc409f40bc08e909b79 | |
parent | dd0f13d85a9f2f8a24cde23865fd56694c066efc [diff] | |
parent | 4551493131f0348ec28a01eb27f4b5d17e18550b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6aec468bff -s ours am: 4551493131 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14143763 Change-Id: Ic2cab3f4cf53bff0160fe046667d2db001f73fa4