commit | 30d7718e9200324a7d0e8048663b7e0313fb61e1 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Jul 04 05:12:06 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 04 05:12:06 2021 +0000 |
tree | ca7aff16e047104cec2f61da941f9a62ca26400c | |
parent | 9984fd84de9a5d79526366a1ea6771f99b4cebe8 [diff] | |
parent | 5654c66518813fd0eb081defb433061fa6e1d964 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ee040c5ff6 -s ours am: 846828162d -s ours am: 5654c66518 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15200286 Change-Id: I5e7e4bed3fc7f4d24c83ad80f621bef878dbb4bc