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