tree ee9a7adf52e294c9cdc0bcd5ff00ee135dcc77c7
parent 581268f5c07c434f552bc05ea961ba7be292b31a
parent 85c48edc697ff9ea39b7b35db807ddc574a49e65
author Bill Yi <byi@google.com> 1550633523 -0800
committer android-build-merger <android-build-merger@google.com> 1550633523 -0800

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

Change-Id: I959988458fa524fb31392d79c3e8dd7ec80d3da5