OSDN Git Service

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

Change-Id: Ib2921d235716e858bddbbb2e3a9588b4133d9c84