OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 34cfd78f8e -s ours
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 02:54:06 +0000 (02:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 02:54:06 +0000 (02:54 +0000)
am: 50a405cf2c  -s ours

Change-Id: I3c90feee62ffc8cf88e9f74859f8e818f019d3e6


Trivial merge