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