[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 4bbf9ac326 -s ours am: 642f0024c3 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19170076 Change-Id: I4322e2d311aebe4c53f1fd8d92598b17cce585f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: