OSDN Git Service

[automerger skipped]Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Sat, 24 Mar 2018 02:05:07 +0000 (02:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 24 Mar 2018 02:05:07 +0000 (02:05 +0000)
am: 02bfc97068  -s ours

Change-Id: I836fbf154864c5abc2fb890b0cdd70467636365d


Trivial merge