tree ee9a7adf52e294c9cdc0bcd5ff00ee135dcc77c7
parent e7f4ad03265d3bfcde5ead8d8d25ffa8e81ce79f
parent ae15ee43e44df006c3d04420b98f76674864ffed
author Bill Yi <byi@google.com> 1550634933 -0800
committer android-build-merger <android-build-merger@google.com> 1550634933 -0800

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

Change-Id: I46dd20dbc70e30354ce0773181ef7e83d926ea35