OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Mon, 12 Jun 2017 21:21:12 +0000 (21:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Jun 2017 21:21:12 +0000 (21:21 +0000)
commite887d2133037d08c6e8297e290754e58d2ae0984
tree4501f50464e1b852dd5068a859c5754aca40e585
parent5884f6ce0d6058efe099c909d64ada35301149f1
parent7c2a12b658160ae98705c54d60117d7914ef58fc
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 7c2a12b658  -s ours

Change-Id: I4170e095966f1d8752e2b020777b5719a779b376