OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Wed, 26 Apr 2017 23:46:03 +0000 (23:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Apr 2017 23:46:03 +0000 (23:46 +0000)
commit4e76a58aafbd2044987f85a4bb744d20a61d761c
tree306df985decf02f6d1de00ba139be6b47a90f454
parent1f137f75990c15851acdea75a0e10120a00faebc
parent62b29503746546e1f031aa639c55b4a301b82ca9
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 62b2950374  -s ours

Change-Id: I795b221dea9ea31efc9e96edaf4598384e75c9ee