OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 18fd5109c9 ...
authorBill Yi <byi@google.com>
Thu, 30 Nov 2017 21:23:22 +0000 (21:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Nov 2017 21:23:22 +0000 (21:23 +0000)
am: 68a3e65ecd  -s ours

Change-Id: I10fac2255546543b6d52c3953dd3c0070a3544f4


Trivial merge