commit | b6d74f71b18d7d93e00453bb1146d90b47d1186a | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Jan 11 03:00:36 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 11 03:00:36 2022 +0000 |
tree | a36890cedd4ad19778c0fbcf48d08bb755fb08c1 | |
parent | 65ff10dc87c6dfda01b640573ead2121fdb3d479 [diff] | |
parent | fa8b5f6369c4fef904ef4dd91d7dbc06d21bef3b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 515bd59ace -s ours am: c8dc775fcc -s ours am: 31b959a214 -s ours am: fa8b5f6369 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1943425 Change-Id: I1c7322e82f3cca3192b91c4ebb08fdfc6813851e