tree be6f8c148f13ded98e479d5171dcdd357e823f52
parent 977ff53c9f7f393d450da386fbf7da8bd860fe7e
parent 1f12d5a14b8f631d9a4060e078fb9cd901bd4626
author Bill Yi <byi@google.com> 1550348732 -0800
committer android-build-merger <android-build-merger@google.com> 1550348732 -0800

[automerger skipped] Import translations. DO NOT MERGE am: 751ffa4da9 -s ours
am: 1f12d5a14b -s ours
am skip reason: subject contains skip directive

Change-Id: I1c43280df0ed96ec474a330af6b91f74c093ae16