OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Fri, 7 Jul 2017 15:52:50 +0000 (15:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Jul 2017 15:52:50 +0000 (15:52 +0000)
commit7828d152d27303414ad68bec33dbdb500c76c787
tree9f882343230d73dc8662847f5c41a34a527baca3
parent8ae470614fbe72021b8a87fb8b434a4242f99146
parent33393ffa7d0b9c4e7f339d27bb7f71af6caf9a15
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 33393ffa7d  -s ours

Change-Id: I43463ebcdccbd71229ee344a6af7b943a94d2dda