commit | 90d7f4a7f26ef78b9c375f69506fdce23e1026b4 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 21:44:55 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 21:44:55 2021 +0000 |
tree | d63895f679e35a398374afc72208b4350afb9a60 | |
parent | 86b5b1ec888462728993a17e5d102b7706f126be [diff] | |
parent | 05957b7ac0e3629f197354c2c4b526089bad82f0 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db44950d25 -s ours am: ca61a9bcca -s ours am: 05957b7ac0 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684939 Change-Id: If983558e39d572f6aa197ede0d67826d41d29bc8