OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 75e1c53fa8 -s ours
authorBill Yi <byi@google.com>
Fri, 19 May 2017 00:08:41 +0000 (00:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 00:08:41 +0000 (00:08 +0000)
commit111a3dd4bfdfbd65c0c06b262ca38504f987f4b7
tree761d5a254ca338b2fe5a5a24675f968df1ce6a5f
parent268ce3c8cd7aad3b4244d3fc159112e23b800ded
parentf332b5dfc8120a9cb85b63cbe4a72b72fa8d3fa5
Merge "Import translations. DO NOT MERGE" into oc-dev am: 75e1c53fa8  -s ours
am: f332b5dfc8  -s ours

Change-Id: I339f5526d50023f54537322ff34a5cb20824bfed