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