tree d5cc7124e732fb21a33401418bd876f0fb9abfd4
parent ce7b14dffb44e92cf76368f378186ce7f9cd59fe
parent bc8ac83844a799ab652d63216699da85911751a9
author Bill Yi <byi@google.com> 1547426401 -0800
committer android-build-merger <android-build-merger@google.com> 1547426401 -0800

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

Change-Id: If35335dd95d837c675269cd498e822c211dd94d6