commit | e8bd87c530e8f0a5e563e528974d721ef2cd781b | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Jan 02 08:16:57 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jan 02 08:16:57 2021 +0000 |
tree | 3d32c0aca4119a3e2f53495d93af28de453ed26e | |
parent | 8aafe1b3d9a191316f2da3a425509749deb05c1c [diff] | |
parent | da33eadd10ae2e60c2ae5ec8192b29a522420389 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fd89d91847 -s ours am: da33eadd10 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539361 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I82ca145f7303f2a5011d9ce501dfccecb598c239