OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c168312e92 ...
authorBill Yi <byi@google.com>
Thu, 30 Nov 2017 22:16:54 +0000 (22:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Nov 2017 22:16:54 +0000 (22:16 +0000)
am: 0911a97fc2  -s ours

Change-Id: Ifa5d3eca8a9fbcd614faa63bedf8f76d2bfcf926


Trivial merge