OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Fri, 23 Jun 2017 15:11:07 +0000 (15:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 15:11:07 +0000 (15:11 +0000)
commit931bc5accc9bb6cd8d64194548f1355e5a5c63a2
tree0735977de7dc830a8bdfd4c2f222eb90873619a1
parentde6aafd00f089a54b5956451fccbf03f7887057d
parentccaf50b6a7948f9529c41253ba497985ca177ea2
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: ccaf50b6a7  -s ours

Change-Id: I95cc8323a6e20d4cdc604dafd0b268fcb42b66d9