OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 67a947b636 -s ours am...
authorBill Yi <byi@google.com>
Thu, 8 Jun 2017 23:27:28 +0000 (23:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 23:27:28 +0000 (23:27 +0000)
am: 355ce9eb98  -s ours

Change-Id: I2493d1958fae0d464e736cf89fd1307a8a68ea49


Trivial merge