commit | dec3151deb62f3676a7956052b9909280ee38729 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 29 00:20:56 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 29 00:20:56 2021 +0000 |
tree | 4e0323d6a5c8fac92995d2aafdf74584165f7798 | |
parent | 1be8f48150eb350dbab8919c44734ab69337834d [diff] | |
parent | 4947a81e8aa6176011436a29d3ca013a384599ad [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4947a81e8a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413710 Change-Id: Ifd7560edcb26f2ec3aff8a7b93001dbdcaa2dfb7