OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 21 Jul 2017 21:57:03 +0000 (21:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Jul 2017 21:57:03 +0000 (21:57 +0000)
commit11da97ccb1dce50a93a673147d5e6ab721235c50
tree7d7411ca1ad2dd3cd554ba2b1b1e0b021fe77bb8
parent8cbab2292e9638eeaf2d22d6f7d44bd2e0bbfda8
parent6acefed3dc168882907b5678a79aa817253e4a62
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 6acefed3dc  -s ours

Change-Id: I5265b85a29a58030443b2881cb62ece9d5514077