OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 995627c3ee -s ours
authorBill Yi <byi@google.com>
Mon, 2 Oct 2017 17:51:36 +0000 (17:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Oct 2017 17:51:36 +0000 (17:51 +0000)
commitc260f7c6bb60915ac61017ae4586bbfdd5057143
tree4db3e95b512b8a7ba728f09ff345e3f2ae2eac58
parentd4c920df48da6659e25a5da914626606bce9f30a
parent899f5cf30984a3b185fd85a14793039fe3055853
Merge "Import translations. DO NOT MERGE" into oc-dev am: 995627c3ee  -s ours
am: 899f5cf309  -s ours

Change-Id: Ia3d156d8da37e54364775285658dbdfd4f176468