OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a4c8fe82e8 ...
authorBill Yi <byi@google.com>
Mon, 21 Nov 2016 02:12:52 +0000 (02:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Nov 2016 02:12:52 +0000 (02:12 +0000)
am: bd36ee3b77  -s ours

Change-Id: If42d45c864baf815fd23507cc74390d9e2c4be1d


Trivial merge