OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 34cfd78f8e -s ours
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 02:54:06 +0000 (02:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 02:54:06 +0000 (02:54 +0000)
commit945cac01661ea2908e05cf59bf2abf1958ca48ba
tree45522cce935f3a9053b1634660d1803b551cc2e6
parentcd3e39fb2121993726f9b7331d4f4240527b9772
parent50a405cf2cda54fbd6817c62d0a27fa4fc82c5dd
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 34cfd78f8e  -s ours
am: 50a405cf2c  -s ours

Change-Id: I3c90feee62ffc8cf88e9f74859f8e818f019d3e6