tree e4100d75063b67c72f9e6e1002592513ac389781
parent 3aa8e18087865a0430220c2dbcfc5fd771e563ec
parent c1fc9ccc7725da3cac606b53d8d2a52ac16c56ff
author Treehugger Robot <treehugger-gerrit@google.com> 1648493179 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648493179 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e0ccac19b6 -s ours am: c1fc9ccc77 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045902

Change-Id: I0cda615bf70247515ef45fbd12ceca3b7fb20c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>