OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 65fb1c889a ...
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 16:48:28 +0000 (16:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 16:48:28 +0000 (16:48 +0000)
am: 0d729e292e  -s ours

Change-Id: I1d6c54f9c2ab8035115103772702e4d177a8c3b4


Trivial merge