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