OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Thu, 13 Apr 2017 15:30:26 +0000 (15:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Apr 2017 15:30:26 +0000 (15:30 +0000)
commit118fa02c5ebc112eae917321045818998f2959bc
tree0d7a5744f9d5ded7ad86b0f37d6baa7f9a2a0d8b
parentcd8f4fb6148fd69c78e31abb9594a9829e6d04b0
parent20099035efcf8270ff16c56c224c063b23252dce
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 20099035ef  -s ours

Change-Id: I34f2a306df2fc2610a14f98df13aa87c808eb29c