| commit | 846828162d50b1a706d39c8cf0fa893784092e9d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Jul 04 04:57:08 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 04 04:57:08 2021 +0000 |
| tree | 219e60d3860f955446dce898ce98e35e1f179c65 | |
| parent | dc888dd6bf6c9d9a3d966b888b0c07d6af2f3198 [diff] | |
| parent | ee040c5ff65ae2adc1ae915566b25f4b537f98dd [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ee040c5ff6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15200286 Change-Id: I1d4a3729628b576425daf25f7036f04f38b3b990