OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Sat, 3 Jun 2017 21:41:24 +0000 (21:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 3 Jun 2017 21:41:24 +0000 (21:41 +0000)
commit77e6256bb9fc6a4736dca85fd086b848574a0e2d
tree09118d3651f5c0259d4033cdd4e0cf039a23b87a
parentd288ca8d2db3dfd735e76c8db1db0114e7301950
parentf31a66331632a893b357dcabdfbf3dd66b6b2d94
Merge "Import translations. DO NOT MERGE" into oc-dev
am: f31a663316  -s ours

Change-Id: I349a8b805ab94428e62bcc5080771a1b675e0bcc