OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Fri, 16 Jun 2017 15:21:10 +0000 (15:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Jun 2017 15:21:10 +0000 (15:21 +0000)
commit0c4e13b41dfb7b671090f61601c3037c0fccb4bc
treea605b728ead7a785e5bd6ef37623082c096a5d99
parent5caa4197308a0ebb804fd28202d7767d2dc632e3
parentd97c62a1da5bf60af0d80b848c96d409be651c64
Merge "Import translations. DO NOT MERGE" into oc-dev
am: d97c62a1da  -s ours

Change-Id: I0c7cdc5f73d7e4cc05fc3b498d8d59439c3fe1ba