| commit | df06b2d73ebc8f919fa37ae1d1073d60d6e5c4ac | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Jul 04 04:56:57 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 04 04:56:57 2021 +0000 |
| tree | df3e2531dbc2062eab1729f982bdb9036443d365 | |
| parent | 92b8838d54997d0c6f6b62cb86aa6f73d4e190cc [diff] | |
| parent | 7d24f665a1b329759ae7c4c7d11cfc11a30dd5ac [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 7c522618ab -s ours am: 7d24f665a1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15200129 Change-Id: I8b5759ebd79444bd4303d1de6177f986d9790aee