OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Fri, 23 Jun 2017 15:21:23 +0000 (15:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 15:21:23 +0000 (15:21 +0000)
commitcdb756273d50b99c87d29e603e1a0809f5d8bf68
tree0735977de7dc830a8bdfd4c2f222eb90873619a1
parent931bc5accc9bb6cd8d64194548f1355e5a5c63a2
parent64465df428c93e45558707a48ccf017bcef95596
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 64465df428  -s ours

Change-Id: Iec197b243600ad21d9e58b272961d3d9ba167f42