OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: b39c08f9d7 -s ours
authorBill Yi <byi@google.com>
Fri, 23 Jun 2017 15:30:56 +0000 (15:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 15:30:56 +0000 (15:30 +0000)
commit315e08aa4ec2c1c93fb28551eb9ff652f62dedb1
tree0735977de7dc830a8bdfd4c2f222eb90873619a1
parentcdb756273d50b99c87d29e603e1a0809f5d8bf68
parent53f4db56120ba03f6c083e9c4a172b8eb97f5f56
Merge "Import translations. DO NOT MERGE" into oc-dev am: b39c08f9d7  -s ours
am: 53f4db5612  -s ours

Change-Id: I74facd707fb3203105b66d6853052bef461e4419