OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Sun, 26 Nov 2017 23:05:52 +0000 (23:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 26 Nov 2017 23:05:52 +0000 (23:05 +0000)
commit1ef2ec2264e9926a52cd4808eb2f61f7db049373
tree501ba5065aff93dda807dbd57d256dc87125d015
parent97e5272958bce3e4463d7d9eb17e70aee3829d9a
parent419407eaea4e8c76d6f1de5f6fc5ff7563633c33
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 419407eaea  -s ours

Change-Id: I5689ca60c3bf9a29c59380c7d3002c6007f8eb05