[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 81a7a3a350 -s ours am: 0243bc09f0 -s ours am: ca65a504bc -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2230340 Change-Id: I240e9ad229539d93ee17c50f86319228b74b7ed5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: