OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4bac557350 ...
authorBill Yi <byi@google.com>
Sun, 2 Apr 2017 08:54:42 +0000 (08:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 2 Apr 2017 08:54:42 +0000 (08:54 +0000)
am: afb631bbd3  -s ours

Change-Id: Ia69bc259d19b21b2099c6e239a93f2b64e72b626


Trivial merge