OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 28 Sep 2017 19:33:32 +0000 (19:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Sep 2017 19:33:32 +0000 (19:33 +0000)
commit532f15022784d1297a4f2a543e6222b7d5a87165
treea58a5996d7a331e4a76d2470e64569ca04368c9b
parentda9247d645353bd41caea482afdb81f5b0586eb5
parentd5b9fec38968551096ce805afcca34290c7c03c8
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: d5b9fec389  -s ours

Change-Id: Iec1b837215cf09e1904287f9eee0082fa4f00097