tree f01b3069cb470dc3df12b46a575efe164e6e55fa
parent 1c5f6a325dd1ec3b7c8852fd66c489de278ab152
parent ceefbcb88bb1c2db8e1879bd4de6c48dc606d996
author Bill Yi <byi@google.com> 1560614885 -0700
committer android-build-merger <android-build-merger@google.com> 1560614885 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 847cc98a4d -s ours am: d4b6851304 -s ours
am: ceefbcb88b -s ours
am skip reason: subject contains skip directive

Change-Id: I98a52880ac8028c4594ec0af697df08514466b81