[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c28e97f85 -s ours am: 88eb6e7d47 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19992502 Change-Id: Ia036ca9b48e7f4820d48c0fabdcf6834b51e0eb0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: