tree 16dc41843ad7b3792df9aa443d3087f2dc45b5a2
parent 266e4983f41ab5fc78853644347642fd7d08d9d3
parent 7a54a3d3ee114abbb22c804bf70f0e8b9f093672
author Bill Yi <byi@google.com> 1555109549 -0700
committer android-build-merger <android-build-merger@google.com> 1555109549 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE"
am: 7a54a3d3ee -s ours
am skip reason: subject contains skip directive

Change-Id: Iac3a6f1f2fa94f997220a0acc5cbbcacc3eb1269