tree a70235945948deff0968ff1af50a810795685572
parent 44d39af7854a5603de6ef59a0d07c445aecde7c0
parent 4462c31ddc5fa2eae4ab6a18e971996c8e1c8e5d
author Bill Yi <byi@google.com> 1533394753 -0700
committer android-build-merger <android-build-merger@google.com> 1533394753 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f6d1e3d0b6  -s ours
am: 4462c31ddc  -s ours

Change-Id: Id698d38c1687991b6ce712691f4ecc3922175722