[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d707ddcead -s ours am: d0cde3b3ed -s ours am: 34437c15c3 -s ours am: 001292aad5 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19163565 Change-Id: I059f425c08ea557aa8342a7d5481b8f36c2c1773 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: