tree 219e60d3860f955446dce898ce98e35e1f179c65
parent 8fc30a5e55093ec1be32abd7ba1b0081561f6360
parent a72bc835f40b03faf00d54ffae193ceeaba0c1de
author TreeHugger Robot <treehugger-gerrit@google.com> 1625373047 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625373047 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a72bc835f4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4d0cb3b8bfac9047fff0c4403989e5e789b53098