OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Fri, 23 Jun 2017 15:21:20 +0000 (15:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 15:21:20 +0000 (15:21 +0000)
commita711db810c623919cb7e706ac152481133998459
tree842c374fd3661b955d0ef7ebf812565d41c79016
parentbabf9d263016ae7dc76d797db053e4607d3b9456
parentb39c08f9d7e87999a2d9bab0831b470f488f5325
Merge "Import translations. DO NOT MERGE" into oc-dev
am: b39c08f9d7  -s ours

Change-Id: Ief41b8c9a76f5d02b7aa5114d47f04d8bf4899fb