OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 995627c3ee -s ours am...
authorBill Yi <byi@google.com>
Mon, 2 Oct 2017 17:59:13 +0000 (17:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Oct 2017 17:59:13 +0000 (17:59 +0000)
commitc25a18ea898e528aabec4afec0d52f572dbb56ad
tree1e8f1e2c2f9a940f9fd3017294e8c788e62fe8d1
parent659cbdf99f45091a14a51c50b6a488c0e89502b8
parentc260f7c6bb60915ac61017ae4586bbfdd5057143
Merge "Import translations. DO NOT MERGE" into oc-dev am: 995627c3ee  -s ours am: 899f5cf309  -s ours
am: c260f7c6bb  -s ours

Change-Id: I930d8e7a4ad3f4fcea358235574b6698dede8772