tree 5feffc0eba63cac9df8f0b9f58a268a88e526bf0
parent 1ca07fd3e1b16239e962a0f5a8c380adfcf841f9
parent cd0a408c511342e519077ddbbe722d180ccf9534
author Bill Yi <byi@google.com> 1631453802 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631453802 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2107755bdd -s ours am: 1a01ce91e6 -s ours am: cd0a408c51 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1d063556adad8d1127b36a06316bdc6ad2e88a03