tree ce7f4ef12224ad878f43cfe81858d66c70b2e5e6
parent c2777a19e113dc206547d82f765b90b87315a6b4
parent 9a162a81251c84e6ca6f17e99db241dca4a89894
author Treehugger Robot <treehugger-gerrit@google.com> 1619118442 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619118442 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I2a42e71ff97960148879df0160f72e71ecbfb874