OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Fri, 6 Apr 2018 15:49:49 +0000 (08:49 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Apr 2018 15:49:49 +0000 (08:49 -0700)
commitff5c256c438da15cccb017094445b0c9790ef6e0
treec9d917dba79836ab689634ed6ff1118d808af389
parent076ed49046745e1243cef1276da9738e1651826c
parent7d4299352014382ae4a53c7bedccc7161294aafd
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 7d42993520  -s ours

Change-Id: Ie116d1be6afac3e17664ccc698c9d87224846d6e