OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1058478d5b ...
authorBill Yi <byi@google.com>
Sun, 2 Apr 2017 09:23:26 +0000 (09:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 2 Apr 2017 09:23:26 +0000 (09:23 +0000)
am: 2dcedc156a  -s ours

Change-Id: I03997e6ac545f54549412b0836a7b22dbb9bb054


Trivial merge