tree fa507515f46718b56da77f4626dcf122aa4da7eb
parent 160112ea99238ead1810ff76d898a11056fcbdfb
parent 96d198497a61c024242dada791515a3325e7676e
author TreeHugger Robot <treehugger-gerrit@google.com> 1616872057 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616872057 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 96d198497a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6f68df306a5a366a95e53dbacd213858896993ec