commit | 1e05802ed09382e2654f52acce0db1f1a28bf65c | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Mar 28 07:41:32 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 28 07:41:32 2022 +0000 |
tree | 4ab28c4e3d0cc05a186eeb2c1796b3aa653af2b5 | |
parent | 52ad0cf416e28208667a3983a3a5c1c84e57e477 [diff] | |
parent | e064fac319d1cf0cd9e65ee0451fb5db736867e5 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e6858f6111 -s ours am: e064fac319 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045846 Change-Id: I7f6451cbafb355a88665db331c1d754506b8ef35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>