OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 639ee5c778 ...
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 16:24:41 +0000 (16:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 16:24:41 +0000 (16:24 +0000)
am: 61632b84b6  -s ours

Change-Id: Ia891428b4b5b8c8269b793f85bf67f635f87579c


Trivial merge