OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Fri, 23 Jun 2017 12:49:12 +0000 (12:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 12:49:12 +0000 (12:49 +0000)
commit8c311afb87d16dec9e10038d99ee69a2cc25b8d1
tree8d1282e0504609254b54345db5a13c32902579ba
parent17bb92fe14e18a65c9f58caff8836ed9072c12dd
parentd406f38d24476efee6f65207e88b03dc14ef2a05
Merge "Import translations. DO NOT MERGE" into oc-dev
am: d406f38d24  -s ours

Change-Id: I898195fead15228c4e4fa5617dacbddfc90dc6e2