OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 88e9aa19e2 -s ours
authorBill Yi <byi@google.com>
Tue, 11 Jul 2017 04:05:50 +0000 (04:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Jul 2017 04:05:50 +0000 (04:05 +0000)
commita7c0a25d39defd46f7c13700d04127fccedb40d3
tree1e7c9ea1b816758b6e315101ab8b892d7718ed4e
parente58b20b0a864b9c0a5076672ea803c9d06f81efb
parent91dcbe4bd905b888924cd04662ea30e1c91d6bdf
Merge "Import translations. DO NOT MERGE" into oc-dev am: 88e9aa19e2  -s ours
am: 91dcbe4bd9  -s ours

Change-Id: I9fb6e2699b3f737053741a2e26095241413dda76