OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Wed, 21 Jun 2017 20:25:08 +0000 (20:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Jun 2017 20:25:08 +0000 (20:25 +0000)
commit1a588ec465909526e0d4a70262c82de1a7f2c3b2
tree63f872fbd2f9f896e4b8d4312ce3e96b0e17603b
parent4b209f21b647645d0013878637749f6c187fa230
parent7c23c990f105651b3e699ae513d78b08d89483fa
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 7c23c990f1  -s ours

Change-Id: I219b010519c5efae20ca065ca29257a1f876fd7e