tree 41ddcfe2c559cfd4c0b62bd78736a9daf5748bec
parent 4e5e4b731b7d33a2a8258b41f16f55b5d97139c2
parent 64d07244511bcca809c7acff40723ad1ba25f183
author Bill Yi <byi@google.com> 1552015045 -0800
committer android-build-merger <android-build-merger@google.com> 1552015045 -0800

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: a487c5840f -s ours
am: 64d0724451 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie6fe35dcad2e0856623a71cfade5846cc201164e