commit | 235f6a230b22fa388580ac40bc606ef9f4ddbaa6 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 19:38:14 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 19:38:14 2021 +0000 |
tree | 87611a13927dbbd03ed3a6efe9f44700c433b172 | |
parent | 7b894e329fc88a5e23f474f2e291b99e8d98a291 [diff] | |
parent | 167d95bed7f5a8df0a25e9a1613281a7b617a037 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b5b6d3680a -s ours am: 167d95bed7 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684628 Change-Id: I0862eafc027bb50fd23e2298fee01f890a66ea0b