tree ae6d9997afc2feffdd212b6ad90d2cc0a22465ab
parent 7136bc4ee13652ba784c4543976253a932994501
parent 87b243e99f93881b68f6a914675282ccc6e67429
author Bill Yi <byi@google.com> 1569479677 -0700
committer android-build-merger <android-build-merger@google.com> 1569479677 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 13fb4eb087 -s ours
am: 87b243e99f -s ours
am skip reason: subject contains skip directive

Change-Id: I638c8058c627ac9eb48448d4dae62a89ea6550a1