OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1d14f1ada0 ...
authorBill Yi <byi@google.com>
Mon, 7 Aug 2017 05:35:45 +0000 (05:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Aug 2017 05:35:45 +0000 (05:35 +0000)
am: fdcf523f18  -s ours

Change-Id: Ia2046b27fe4d8b355ddc88bc3be50dd2340fcac7


Trivial merge