tree ee9a7adf52e294c9cdc0bcd5ff00ee135dcc77c7
parent b8836a494163ab4bc9d31493d2128082a7969b8b
parent 60685350c61c1f170984716ef57c26f251110034
author Bill Yi <byi@google.com> 1550634277 -0800
committer android-build-merger <android-build-merger@google.com> 1550634277 -0800

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

Change-Id: I6971151c9547b8d8e1867a5732b2ab1c1bb7b9c3