tree 87611a13927dbbd03ed3a6efe9f44700c433b172
parent a3ccedb3fc3d59434d93b22f88e9a1886d5789fc
parent ff696632458e47b6b49e2695324b635930a7c605
author Treehugger Robot <treehugger-gerrit@google.com> 1619121679 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619121679 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I6bf6a845125d1d3eb9f2cf927f004cd7ed2944c4