tree 31633c5b901bfefe291f63b21cda2e307aa3f643
parent 15b0f45c4962f1c76a0aa706c670e87f013d21e6
parent 64ca10b75bb7e8b8b9633b57f2a5fcaeb3c395b3
author Bill Yi <byi@google.com> 1548043653 -0800
committer android-build-merger <android-build-merger@google.com> 1548043653 -0800

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

Change-Id: I9cb42f21c58744655490cb81900a551fb4e20d77