OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Fri, 6 Apr 2018 15:35:24 +0000 (08:35 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Apr 2018 15:35:24 +0000 (08:35 -0700)
commitcf750187e7c7af7ffb8aa7ccddd79d98ae539f5b
tree9ca1f7d19f8ab0a20650069c7304d9da0ea15d4a
parent23f11e4036a231104ecc17ad4d42d06848e99d8b
parent9101ba2d2d4816d412118da23f956b43049ed69c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 9101ba2d2d  -s ours

Change-Id: Icd69fa703400606e32f1a6b7b28fe581e2928468