OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Wed, 2 Aug 2017 14:35:59 +0000 (14:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 14:35:59 +0000 (14:35 +0000)
commit0c411c32cd2d4d5ab5760ebf0c81181679b98c38
tree22d78e33931a600333714433046dce373897d034
parent5e049eb884d371ba54f084a63a707133b4d3a828
parent9ce641fd8179dc2f9133da3e8b93fc0fb953d950
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 9ce641fd81  -s ours

Change-Id: I1dff9545bf7cc357ef8d3bac8954d59c0c23b5c4